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

Unified Diff: chrome/browser/ui/cocoa/browser/avatar_button_controller_unittest.mm

Issue 117533002: [Mac] Redesign of the avatar menu button (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: nico review Created 6 years, 11 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/browser/avatar_button_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser/avatar_button_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/avatar_button_controller_unittest.mm
index 99a3b5705c05ecb1ea5598da9ac3cf7184489316..0d79f703f467e5987f1880bffa4f926d2ffe1b35 100644
--- a/chrome/browser/ui/cocoa/browser/avatar_button_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/avatar_button_controller_unittest.mm
@@ -1,36 +1,36 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#import "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
+#include "base/command_line.h"
#include "base/mac/scoped_nsobject.h"
-#include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
-#include "chrome/browser/bookmarks/bookmark_test_helpers.h"
-#include "chrome/browser/managed_mode/managed_user_service.h"
-#include "chrome/browser/managed_mode/managed_user_service_factory.h"
-#include "chrome/browser/prefs/pref_service_syncable.h"
-#include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "base/strings/sys_string_conversions.h"
+#include "chrome/browser/profiles/profiles_state.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
-#include "chrome/browser/ui/browser_commands.h"
#include "chrome/browser/ui/browser_window.h"
#import "chrome/browser/ui/cocoa/base_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/browser/profile_chooser_controller.h"
#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
#include "chrome/browser/ui/cocoa/info_bubble_window.h"
-#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_profile.h"
+#include "chrome/common/chrome_switches.h"
+
+const char kDefaultProfileName[] = "default";
class AvatarButtonControllerTest : public CocoaProfileTest {
public:
virtual void SetUp() OVERRIDE {
+ CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kNewProfileManagement);
+ DCHECK(profiles::IsMultipleProfilesEnabled());
+
CocoaProfileTest::SetUp();
ASSERT_TRUE(browser());
controller_.reset(
[[AvatarButtonController alloc] initWithBrowser:browser()]);
- [[controller_ view] setHidden:YES];
}
virtual void TearDown() OVERRIDE {
@@ -48,33 +48,19 @@ class AvatarButtonControllerTest : public CocoaProfileTest {
base::scoped_nsobject<AvatarButtonController> controller_;
};
-TEST_F(AvatarButtonControllerTest, AddRemoveProfiles) {
- EXPECT_TRUE([view() isHidden]);
-
- testing_profile_manager()->CreateTestingProfile("one");
-
+TEST_F(AvatarButtonControllerTest, ButtonShown) {
EXPECT_FALSE([view() isHidden]);
-
- testing_profile_manager()->CreateTestingProfile("two");
- EXPECT_FALSE([view() isHidden]);
-
- testing_profile_manager()->DeleteTestingProfile("one");
- EXPECT_FALSE([view() isHidden]);
-
- testing_profile_manager()->DeleteTestingProfile("two");
- EXPECT_TRUE([view() isHidden]);
+ EXPECT_EQ(kDefaultProfileName, base::SysNSStringToUTF8([button() title]));
}
TEST_F(AvatarButtonControllerTest, DoubleOpen) {
- // Create a second profile to enable the avatar menu.
- testing_profile_manager()->CreateTestingProfile("p2");
-
EXPECT_FALSE([controller() menuController]);
[button() performClick:button()];
BaseBubbleController* menu = [controller() menuController];
EXPECT_TRUE(menu);
+ EXPECT_TRUE([menu isKindOfClass:[ProfileChooserController class]]);
[button() performClick:button()];
EXPECT_EQ(menu, [controller() menuController]);
@@ -84,37 +70,4 @@ TEST_F(AvatarButtonControllerTest, DoubleOpen) {
info_bubble::kAnimateNone;
[menu close];
EXPECT_FALSE([controller() menuController]);
-
- testing_profile_manager()->DeleteTestingProfile("p2");
-}
-
-TEST_F(AvatarButtonControllerTest, ManagedUserLabel) {
- DCHECK(!profile()->IsManaged());
- EXPECT_FALSE([controller() labelButtonView]);
-
- // Create a second, managed profile to enable the avatar menu.
- std::string name = "p2";
- TestingProfile* profile = testing_profile_manager()->CreateTestingProfile(
- name, scoped_ptr<PrefServiceSyncable>(), base::ASCIIToUTF16(name), 0,
- "asdf", TestingProfile::TestingFactories());
- EXPECT_TRUE(profile->IsManaged());
-
- // http://crbug.com/39725
- TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
- profile, &TemplateURLServiceFactory::BuildInstanceFor);
- AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
- profile, &AutocompleteClassifierFactory::BuildInstanceFor);
- profile->CreateBookmarkModel(true);
- test::WaitForBookmarkModelToLoad(profile);
-
- Browser* browser =
- new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop()));
- // Build a new controller to check if it is initialized correctly for a
- // managed user profile.
- base::scoped_nsobject<AvatarButtonController> controller(
- [[AvatarButtonController alloc] initWithBrowser:browser]);
-
- EXPECT_TRUE([controller labelButtonView]);
-
- browser->window()->Close();
}
« no previous file with comments | « chrome/browser/ui/cocoa/browser/avatar_button_controller.mm ('k') | chrome/browser/ui/cocoa/browser/avatar_icon_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698