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

Unified Diff: chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm

Issue 1020863007: Revert of Change default code flag to NewAvatarMenu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm
index d357b8922630d5c9183efc80835a2ab2a8cff62c..d48823787d947b18f4e949c7e1de20ca9f6afb21 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller_unittest.mm
@@ -4,7 +4,6 @@
#import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h"
-#include "base/command_line.h"
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_pump_mac.h"
@@ -16,7 +15,6 @@
#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile_manager.h"
-#include "components/signin/core/common/profile_management_switches.h"
#include "testing/gtest_mac.h"
#import "ui/base/cocoa/controls/hyperlink_button_cell.h"
#include "ui/events/test/cocoa_test_event_utils.h"
@@ -28,9 +26,6 @@
}
void SetUp() override {
- switches::DisableNewAvatarMenuForTesting(
- base::CommandLine::ForCurrentProcess());
-
CocoaTest::SetUp();
ASSERT_TRUE(manager_.SetUp());
@@ -83,7 +78,7 @@
NSView* contents = [[controller() window] contentView];
EXPECT_EQ(4U, [[contents subviews] count]);
- // Loop over the items and match the viewController views to subviews.
+ // Loop over the itmes and match the viewController views to subviews.
NSMutableArray* subviews =
[NSMutableArray arrayWithArray:[contents subviews]];
for (AvatarMenuItemController* viewController in [controller() items]) {

Powered by Google App Engine
This is Rietveld 408576698