Merge 176800

chrome/browser/chromeos/login/mock_login_utils.h

Index: chrome/browser/chromeos/login/mock_login_utils.h
===================================================================
--- chrome/browser/chromeos/login/mock_login_utils.h	(revision 177312)
+++ chrome/browser/chromeos/login/mock_login_utils.h	(working copy)
@@ -29,10 +29,9 @@
   virtual ~MockLoginUtils();
 
   MOCK_METHOD2(DoBrowserLaunch, void(Profile*, LoginDisplayHost*));
-  MOCK_METHOD7(PrepareProfile,
+  MOCK_METHOD6(PrepareProfile,
                void(const std::string&, const std::string&, const std::string&,
-                    bool, bool, bool,
-                    LoginUtils::Delegate*));
+                    bool, bool, LoginUtils::Delegate*));
   MOCK_METHOD1(DelegateDeleted, void(LoginUtils::Delegate*));
   MOCK_METHOD1(CompleteOffTheRecordLogin, void(const GURL&));
   MOCK_METHOD1(SetFirstLoginPrefs, void(PrefService*));
@@ -41,8 +40,6 @@
   MOCK_METHOD0(PrewarmAuthentication, void(void));
   MOCK_METHOD1(RestoreAuthenticationSession, void(Profile*));
   MOCK_METHOD1(StartTokenServices, void(Profile*));
-  MOCK_METHOD2(StartSignedInServices,
-               void(Profile*, const GaiaAuthConsumer::ClientLoginResult&));
   MOCK_METHOD2(TransferDefaultCookiesAndServerBoundCerts,
                void(Profile*, Profile*));
   MOCK_METHOD2(TransferDefaultAuthCache, void(Profile*, Profile*));