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

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

Issue 229163004: [Mac] Move profile related UI from cocoa/browser to cocoa/profiles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: oops forgot a comment Created 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/browser/avatar_icon_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser/avatar_icon_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/avatar_icon_controller_unittest.mm
deleted file mode 100644
index 6481545aa58fa98e9cb268122f48d01283f36b24..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/cocoa/browser/avatar_icon_controller_unittest.mm
+++ /dev/null
@@ -1,123 +0,0 @@
-// 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_icon_controller.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 "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/avatar_menu_bubble_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"
-
-class AvatarIconControllerTest : public CocoaProfileTest {
- public:
- virtual void SetUp() OVERRIDE {
- CocoaProfileTest::SetUp();
- ASSERT_TRUE(browser());
-
- controller_.reset(
- [[AvatarIconController alloc] initWithBrowser:browser()]);
- [[controller_ view] setHidden:YES];
- }
-
- virtual void TearDown() OVERRIDE {
- browser()->window()->Close();
- CocoaProfileTest::TearDown();
- }
-
- NSButton* button() { return [controller_ buttonView]; }
-
- NSView* view() { return [controller_ view]; }
-
- AvatarIconController* controller() { return controller_.get(); }
-
- private:
- base::scoped_nsobject<AvatarIconController> controller_;
-};
-
-TEST_F(AvatarIconControllerTest, AddRemoveProfiles) {
- EXPECT_TRUE([view() isHidden]);
-
- testing_profile_manager()->CreateTestingProfile("one");
-
- 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]);
-}
-
-TEST_F(AvatarIconControllerTest, 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 isKindOfClass:[AvatarMenuBubbleController class]]);
-
- EXPECT_TRUE(menu);
-
- [button() performClick:button()];
- EXPECT_EQ(menu, [controller() menuController]);
-
- // Do not animate out because that is hard to test around.
- static_cast<InfoBubbleWindow*>(menu.window).allowedAnimations =
- info_bubble::kAnimateNone;
- [menu close];
- EXPECT_FALSE([controller() menuController]);
-
- testing_profile_manager()->DeleteTestingProfile("p2");
-}
-
-TEST_F(AvatarIconControllerTest, 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<AvatarIconController> controller(
- [[AvatarIconController alloc] initWithBrowser:browser]);
-
- EXPECT_TRUE([controller labelButtonView]);
-
- browser->window()->Close();
-}
« no previous file with comments | « chrome/browser/ui/cocoa/browser/avatar_icon_controller.mm ('k') | chrome/browser/ui/cocoa/browser/avatar_label_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698