chrome/browser/status_icons/status_tray_unittest.cc - Issue 10156004: status_icons: Fold RemoveAllIcons() into StatusTray dtor.

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 10156004: status_icons: Fold RemoveAllIcons() into StatusTray dtor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix unittest Created 8 years, 8 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

« chrome/browser/status_icons/status_tray.cc ('K') | « chrome/browser/status_icons/status_tray.cc ('k') | no next file » | no next file with comments »

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

7 #include "base/utf_string_conversions.h"	7 #include "base/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"

(...skipping 27 matching lines...) Expand all Loading...
38	38

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 // Calling again should do nothing.

49 tray.RemoveStatusIcon(icon);

50 }	48 }

OLD	NEW