Remove browser::FindLastActiveWithProfile call in login_ui_service.cc by plumbing the Browser* thro…

chrome/browser/sync/sync_global_error_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/sync/sync_global_error.h"
 
 #include "base/basictypes.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/signin/signin_manager.h"
@@ skipping 20 matching lines @@
 class BrowserMock: public Browser {
  public:
   explicit BrowserMock(Type type, Profile* profile) : Browser(type, profile) {}
 
   MOCK_METHOD2(ExecuteCommandWithDisposition,
                void(int command_id, WindowOpenDisposition));
 };
 
 class LoginUIServiceMock: public LoginUIService {
  public:
-  explicit LoginUIServiceMock(Profile* profile) : LoginUIService(profile) {}
-  MOCK_METHOD0(ShowLoginUI, void());
+  explicit LoginUIServiceMock() : LoginUIService() {}
+  MOCK_METHOD1(ShowLoginUI, void(Browser*));
 };
 
 ProfileKeyedService* BuildMockLoginUIService(Profile* profile) {
-  return new LoginUIServiceMock(profile);
+  return new LoginUIServiceMock();
 }
 
 // Same as BrowserWithTestWindowTest, but uses MockBrowser to test calls to
 // ExecuteCommand method.
 class SyncGlobalErrorTest : public BrowserWithTestWindowTest {
  public:
   SyncGlobalErrorTest() {}
   virtual ~SyncGlobalErrorTest() {}
 
   virtual void SetUp() OVERRIDE {
@@ skipping 50 matching lines @@
 #if defined(OS_CHROMEOS)
   if (error_state != GoogleServiceAuthError::NONE) {
     // In CrOS sign-in/sign-out is made to fix the error.
     EXPECT_CALL(*static_cast<BrowserMock*>(browser),
                 ExecuteCommandWithDisposition(IDC_EXIT, _));
     error->ExecuteMenuItem(browser);
   }
 #else
   // Test message handler.
   if (is_error) {
-    EXPECT_CALL(*login_ui_service, ShowLoginUI());
+    EXPECT_CALL(*login_ui_service, ShowLoginUI(browser));
     error->ExecuteMenuItem(browser);
-    EXPECT_CALL(*login_ui_service, ShowLoginUI());
+    EXPECT_CALL(*login_ui_service, ShowLoginUI(browser));
     error->BubbleViewAcceptButtonPressed(browser);
     error->BubbleViewDidClose(browser);
   }
 #endif
 }
 
 } // namespace
 
 // Test that SyncGlobalError shows an error if a passphrase is required.
 TEST_F(SyncGlobalErrorTest, PassphraseGlobalError) {
@@ skipping 53 matching lines @@
     { GoogleServiceAuthError::HOSTED_NOT_ALLOWED, true },
   };
 
   for (size_t i = 0; i < sizeof(table)/sizeof(*table); ++i) {
     VerifySyncGlobalErrorResult(&service, login_ui_service, browser(), &error,
                                 table[i].error_state, true, table[i].is_error);
     VerifySyncGlobalErrorResult(&service, login_ui_service, browser(), &error,
                                 table[i].error_state, false, false);
   }
 }