Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Side by Side Diff: chrome/browser/task_manager/task_manager_unittest.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/task_manager/task_manager.h" 5 #include "chrome/browser/task_manager/task_manager.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "chrome/browser/task_manager/resource_provider.h" 11 #include "chrome/browser/task_manager/resource_provider.h"
12 #include "grit/chromium_strings.h" 12 #include "grit/chromium_strings.h"
13 #include "grit/generated_resources.h" 13 #include "grit/generated_resources.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/base/l10n/l10n_util.h" 15 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/gfx/image/image_skia.h" 16 #include "ui/gfx/image/image_skia.h"
17 17
18 using base::ASCIIToUTF16;
19
18 namespace { 20 namespace {
19 21
20 #if defined(OS_MACOSX) 22 #if defined(OS_MACOSX)
21 // From task_manager.cc: 23 // From task_manager.cc:
22 // Activity Monitor shows %cpu with one decimal digit -- be 24 // Activity Monitor shows %cpu with one decimal digit -- be
23 // consistent with that. 25 // consistent with that.
24 const char* kZeroCPUUsage = "0.0"; 26 const char* kZeroCPUUsage = "0.0";
25 #else 27 #else
26 const char* kZeroCPUUsage = "0"; 28 const char* kZeroCPUUsage = "0";
27 #endif 29 #endif
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 TaskManagerModel* model = task_manager.model_.get(); 117 TaskManagerModel* model = task_manager.model_.get();
116 TestResource resource; 118 TestResource resource;
117 119
118 task_manager.AddResource(&resource); 120 task_manager.AddResource(&resource);
119 ASSERT_FALSE(resource.refresh_called()); 121 ASSERT_FALSE(resource.refresh_called());
120 model->update_state_ = TaskManagerModel::TASK_PENDING; 122 model->update_state_ = TaskManagerModel::TASK_PENDING;
121 model->Refresh(); 123 model->Refresh();
122 ASSERT_TRUE(resource.refresh_called()); 124 ASSERT_TRUE(resource.refresh_called());
123 task_manager.RemoveResource(&resource); 125 task_manager.RemoveResource(&resource);
124 } 126 }
OLDNEW
« no previous file with comments | « chrome/browser/task_manager/task_manager_notification_browsertest.cc ('k') | chrome/browser/task_manager/task_manager_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698