summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager/task_manager_unittest.cc
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 21:51:56 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-03 21:51:56 +0000
commitbe3c1e93ec6381e99a867262a1108e6df0c8285b (patch)
tree64e04e3f991141019a39e2676d9b9947c0e0ebfb /chrome/browser/task_manager/task_manager_unittest.cc
parentdc849cc62a3b3ad1b0cc246e88dc4d204a9774cc (diff)
downloadchromium_src-be3c1e93ec6381e99a867262a1108e6df0c8285b.zip
chromium_src-be3c1e93ec6381e99a867262a1108e6df0c8285b.tar.gz
chromium_src-be3c1e93ec6381e99a867262a1108e6df0c8285b.tar.bz2
Remove wstring from the task manager.
BUG=23581 TEST=no visible changes; all tests pass Review URL: http://codereview.chromium.org/6410065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager/task_manager_unittest.cc')
-rw-r--r--chrome/browser/task_manager/task_manager_unittest.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/task_manager/task_manager_unittest.cc b/chrome/browser/task_manager/task_manager_unittest.cc
index a4e93f5..d7478a4 100644
--- a/chrome/browser/task_manager/task_manager_unittest.cc
+++ b/chrome/browser/task_manager/task_manager_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -30,7 +30,9 @@ class TestResource : public TaskManager::Resource {
public:
TestResource() : refresh_called_(false) {}
- virtual std::wstring GetTitle() const { return L"test title"; }
+ virtual string16 GetTitle() const OVERRIDE {
+ return ASCIIToUTF16("test title");
+ }
virtual SkBitmap GetIcon() const { return SkBitmap(); }
virtual base::ProcessHandle GetProcess() const {
return base::GetCurrentProcessHandle();