Merge 176800

chrome/browser/chromeos/login/mock_login_utils.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_LOGIN_UTILS_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_LOGIN_UTILS_H_
 
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 namespace chromeos {
 
 class LoginStatusConsumer;
 
 class MockLoginUtils : public LoginUtils {
  public:
   MockLoginUtils();
   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*));
   MOCK_METHOD1(CreateAuthenticator,
                scoped_refptr<Authenticator>(LoginStatusConsumer*));
   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*));
   MOCK_METHOD0(StopBackgroundFetchers, void(void));
   MOCK_METHOD3(GetOffTheRecordCommandLine,
                std::string(const GURL&, const CommandLine&, CommandLine*));
   MOCK_METHOD1(InitRlzDelayed, void(Profile*));
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_LOGIN_UTILS_H_