chrome/browser/status_icons/status_tray_unittest.cc - Issue 3058027: Add #include utf_string_conversions.h to all files that use ASCIIToWide and...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 3058027: Add #include utf_string_conversions.h to all files that use ASCIIToWide and... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 10 years, 4 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

« no previous file with comments | « chrome/browser/status_icons/status_tray_manager.cc ('k') | chrome/browser/sync/profile_sync_service.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/string_util.h"	5 #include "base/string_util.h"

	6 #include "base/utf_string_conversions.h"

6 #include "chrome/browser/status_icons/status_icon.h"	7 #include "chrome/browser/status_icons/status_icon.h"

7 #include "chrome/browser/status_icons/status_tray.h"	8 #include "chrome/browser/status_icons/status_tray.h"

8 #include "testing/gmock/include/gmock/gmock.h"	9 #include "testing/gmock/include/gmock/gmock.h"

9 #include "testing/gtest/include/gtest/gtest.h"	10 #include "testing/gtest/include/gtest/gtest.h"

10	11

11 using testing::Return;	12 using testing::Return;

12	13

13 class MockStatusIcon : public StatusIcon {	14 class MockStatusIcon : public StatusIcon {

14 virtual void SetImage(const SkBitmap& image) {}	15 virtual void SetImage(const SkBitmap& image) {}

15 virtual void SetPressedImage(const SkBitmap& image) {}	16 virtual void SetPressedImage(const SkBitmap& image) {}

(...skipping 29 matching lines...) Expand all Loading...
45 EXPECT_CALL(tray, CreateStatusIcon()).Times(2)	46 EXPECT_CALL(tray, CreateStatusIcon()).Times(2)

46 .WillOnce(Return(new MockStatusIcon()))	47 .WillOnce(Return(new MockStatusIcon()))

47 .WillOnce(Return(new MockStatusIcon()));	48 .WillOnce(Return(new MockStatusIcon()));

48 StatusIcon* icon = tray.GetStatusIcon(id);	49 StatusIcon* icon = tray.GetStatusIcon(id);

49 EXPECT_EQ(icon, tray.GetStatusIcon(id));	50 EXPECT_EQ(icon, tray.GetStatusIcon(id));

50	51

51 // If we remove the icon, then we should create a new one the next time in.	52 // If we remove the icon, then we should create a new one the next time in.

52 tray.RemoveStatusIcon(id);	53 tray.RemoveStatusIcon(id);

53 tray.GetStatusIcon(id);	54 tray.GetStatusIcon(id);

54 }	55 }

OLD	NEW