MacViews: Remove BrowserWindowController dependency from AppController

chrome/browser/ui/cocoa/browser_window_controller_unittest.mm

Index: chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
index 868deb5f3dcaa024a5bb1fd92ef41f9c0b5c9026..e1a1cbf6be7de337b73a268f33f4f38f2ade326e 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm
@@ -8,15 +8,8 @@
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
-#include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/signin/fake_signin_manager.h"
-#include "chrome/browser/signin/signin_error_controller_factory.h"
-#include "chrome/browser/signin/signin_manager_factory.h"
-#include "chrome/browser/sync/profile_sync_service.h"
-#include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/sync/profile_sync_service_mock.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
@@ -26,17 +19,10 @@
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/grit/chromium_strings.h"
-#include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/testing_profile.h"
-#include "components/signin/core/browser/fake_auth_status_provider.h"
-#include "components/signin/core/browser/signin_error_controller.h"
-#include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/base/l10n/l10n_util_mac.h"
 
 using ::testing::Return;
 
@@ -677,145 +663,6 @@ TEST_F(BrowserWindowControllerTest, TestFindBarOnTop) {
   EXPECT_GT(findBar_index, bookmark_index);
 }
 
-TEST_F(BrowserWindowControllerTest, TestSigninMenuItemNoErrors) {
-  base::scoped_nsobject<NSMenuItem> syncMenuItem(
-      [[NSMenuItem alloc] initWithTitle:@""
-                                 action:@selector(commandDispatch)
-                          keyEquivalent:@""]);
-  [syncMenuItem setTag:IDC_SHOW_SYNC_SETUP];
-
-  NSString* startSignin =
-    l10n_util::GetNSStringFWithFixup(
-        IDS_SYNC_MENU_PRE_SYNCED_LABEL,
-        l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME));
-
-  // Make sure shouldShow parameter is obeyed, and we get the default
-  // label if not signed in.
-  [BrowserWindowController updateSigninItem:syncMenuItem
-                                 shouldShow:YES
-                             currentProfile:profile()];
-
-  EXPECT_TRUE([[syncMenuItem title] isEqualTo:startSignin]);
-  EXPECT_FALSE([syncMenuItem isHidden]);
-
-  [BrowserWindowController updateSigninItem:syncMenuItem
-                                 shouldShow:NO
-                             currentProfile:profile()];
-  EXPECT_TRUE([[syncMenuItem title] isEqualTo:startSignin]);
-  EXPECT_TRUE([syncMenuItem isHidden]);
-
-  // Now sign in.
-  std::string username = "foo@example.com";
-  NSString* alreadySignedIn =
-    l10n_util::GetNSStringFWithFixup(IDS_SYNC_MENU_SYNCED_LABEL,
-                                     base::UTF8ToUTF16(username));
-  SigninManager* signin = SigninManagerFactory::GetForProfile(profile());
-  signin->SetAuthenticatedUsername(username);
-  ProfileSyncService* sync =
-    ProfileSyncServiceFactory::GetForProfile(profile());
-  sync->SetSyncSetupCompleted();
-  [BrowserWindowController updateSigninItem:syncMenuItem
-                                 shouldShow:YES
-                             currentProfile:profile()];
-  EXPECT_TRUE([[syncMenuItem title] isEqualTo:alreadySignedIn]);
-  EXPECT_FALSE([syncMenuItem isHidden]);
-}
-
-TEST_F(BrowserWindowControllerTest, TestSigninMenuItemAuthError) {
-  base::scoped_nsobject<NSMenuItem> syncMenuItem(
-      [[NSMenuItem alloc] initWithTitle:@""
-                                 action:@selector(commandDispatch)
-                          keyEquivalent:@""]);
-  [syncMenuItem setTag:IDC_SHOW_SYNC_SETUP];
-
-  // Now sign in.
-  std::string username = "foo@example.com";
-  SigninManager* signin = SigninManagerFactory::GetForProfile(profile());
-  signin->SetAuthenticatedUsername(username);
-  ProfileSyncService* sync =
-      ProfileSyncServiceFactory::GetForProfile(profile());
-  sync->SetSyncSetupCompleted();
-  // Force an auth error.
-  FakeAuthStatusProvider provider(
-      SigninErrorControllerFactory::GetForProfile(profile()));;
-  GoogleServiceAuthError error(
-      GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS);
-  provider.SetAuthError("user@gmail.com", "user@gmail.com", error);
-  [BrowserWindowController updateSigninItem:syncMenuItem
-                                 shouldShow:YES
-                             currentProfile:profile()];
-  NSString* authError =
-    l10n_util::GetNSStringWithFixup(IDS_SYNC_SIGN_IN_ERROR_WRENCH_MENU_ITEM);
-  EXPECT_TRUE([[syncMenuItem title] isEqualTo:authError]);
-  EXPECT_FALSE([syncMenuItem isHidden]);
-
-}
-
-// If there's a separator after the signin menu item, make sure it is hidden/
-// shown when the signin menu item is.
-TEST_F(BrowserWindowControllerTest, TestSigninMenuItemWithSeparator) {
-  base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
-  NSMenuItem* signinMenuItem =
-      [menu addItemWithTitle:@""
-                      action:@selector(commandDispatch)
-               keyEquivalent:@""];
-  [signinMenuItem setTag:IDC_SHOW_SYNC_SETUP];
-  NSMenuItem* followingSeparator = [NSMenuItem separatorItem];
-  [menu addItem:followingSeparator];
-  [signinMenuItem setHidden:NO];
-  [followingSeparator setHidden:NO];
-
-  [BrowserWindowController updateSigninItem:signinMenuItem
-                                 shouldShow:NO
-                             currentProfile:profile()];
-
-  EXPECT_FALSE([followingSeparator isEnabled]);
-  EXPECT_TRUE([signinMenuItem isHidden]);
-  EXPECT_TRUE([followingSeparator isHidden]);
-
-  [BrowserWindowController updateSigninItem:signinMenuItem
-                                 shouldShow:YES
-                             currentProfile:profile()];
-
-  EXPECT_FALSE([followingSeparator isEnabled]);
-  EXPECT_FALSE([signinMenuItem isHidden]);
-  EXPECT_FALSE([followingSeparator isHidden]);
-}
-
-// If there's a non-separator item after the signin menu item, it should not
-// change state when the signin menu item is hidden/shown.
-TEST_F(BrowserWindowControllerTest, TestSigninMenuItemWithNonSeparator) {
-  base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
-  NSMenuItem* signinMenuItem =
-      [menu addItemWithTitle:@""
-                      action:@selector(commandDispatch)
-               keyEquivalent:@""];
-  [signinMenuItem setTag:IDC_SHOW_SYNC_SETUP];
-  NSMenuItem* followingNonSeparator =
-      [menu addItemWithTitle:@""
-                      action:@selector(commandDispatch)
-               keyEquivalent:@""];
-  [signinMenuItem setHidden:NO];
-  [followingNonSeparator setHidden:NO];
-
-  [BrowserWindowController updateSigninItem:signinMenuItem
-                                 shouldShow:NO
-                             currentProfile:profile()];
-
-  EXPECT_TRUE([followingNonSeparator isEnabled]);
-  EXPECT_TRUE([signinMenuItem isHidden]);
-  EXPECT_FALSE([followingNonSeparator isHidden]);
-
-  [followingNonSeparator setHidden:YES];
-  [BrowserWindowController updateSigninItem:signinMenuItem
-                                 shouldShow:YES
-                             currentProfile:profile()];
-
-  EXPECT_TRUE([followingNonSeparator isEnabled]);
-  EXPECT_FALSE([signinMenuItem isHidden]);
-  EXPECT_TRUE([followingNonSeparator isHidden]);
-}
-
 // Verify that hit testing works correctly when the bookmark bar overlaps
 // web contents.
 TEST_F(BrowserWindowControllerTest, BookmarkBarHitTest) {