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

Side by Side Diff: chrome/browser/status_icons/status_tray_unittest.cc

Issue 15906011: Use a direct include of strings headers in chrome/browser/r*-s*/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/string_util.h" 6 #include "base/strings/string_util.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/status_icons/status_icon.h" 8 #include "chrome/browser/status_icons/status_icon.h"
9 #include "chrome/browser/status_icons/status_tray.h" 9 #include "chrome/browser/status_icons/status_tray.h"
10 #include "testing/gmock/include/gmock/gmock.h" 10 #include "testing/gmock/include/gmock/gmock.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 12
13 using testing::Return; 13 using testing::Return;
14 14
15 class MockStatusIcon : public StatusIcon { 15 class MockStatusIcon : public StatusIcon {
16 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE {} 16 virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE {}
(...skipping 22 matching lines...) Expand all
39 // Make sure that removing an icon removes it from the list. 39 // Make sure that removing an icon removes it from the list.
40 TEST(StatusTrayTest, CreateRemove) { 40 TEST(StatusTrayTest, CreateRemove) {
41 TestStatusTray tray; 41 TestStatusTray tray;
42 EXPECT_CALL(tray, 42 EXPECT_CALL(tray,
43 CreatePlatformStatusIcon()).WillOnce(Return(new MockStatusIcon())); 43 CreatePlatformStatusIcon()).WillOnce(Return(new MockStatusIcon()));
44 StatusIcon* icon = tray.CreateStatusIcon(); 44 StatusIcon* icon = tray.CreateStatusIcon();
45 EXPECT_EQ(1U, tray.status_icons_.size()); 45 EXPECT_EQ(1U, tray.status_icons_.size());
46 tray.RemoveStatusIcon(icon); 46 tray.RemoveStatusIcon(icon);
47 EXPECT_EQ(0U, tray.status_icons_.size()); 47 EXPECT_EQ(0U, tray.status_icons_.size());
48 } 48 }
OLDNEW
« no previous file with comments | « chrome/browser/status_icons/status_icon.h ('k') | chrome/browser/storage_monitor/image_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698