Revert 183647

chrome/browser/chromeos/login/mock_user_manager.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_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_
 
 #include <string>
 
 #include "base/file_path.h"
@@ skipping 42 matching lines @@
   MOCK_CONST_METHOD0(IsLoggedInAsPublicAccount, bool(void));
   MOCK_CONST_METHOD0(IsLoggedInAsGuest, bool(void));
   MOCK_CONST_METHOD0(IsLoggedInAsStub, bool(void));
   MOCK_CONST_METHOD0(IsSessionStarted, bool(void));
   MOCK_CONST_METHOD0(HasBrowserRestarted, bool(void));
   MOCK_CONST_METHOD1(IsUserNonCryptohomeDataEphemeral,
                      bool(const std::string&));
   MOCK_METHOD1(AddObserver, void(UserManager::Observer*));
   MOCK_METHOD1(RemoveObserver, void(UserManager::Observer*));
   MOCK_METHOD0(NotifyLocalStateChanged, void(void));
-  MOCK_CONST_METHOD0(GetMergeSessionState, MergeSessionState(void));
-  MOCK_METHOD1(SetMergeSessionState, void(MergeSessionState));
 
   // You can't mock this function easily because nobody can create User objects
   // but the UserManagerImpl and us.
   virtual const User* GetLoggedInUser() const OVERRIDE;
 
   // You can't mock this function easily because nobody can create User objects
   // but the UserManagerImpl and us.
   virtual User* GetLoggedInUser() OVERRIDE;
 
   virtual UserImageManager* GetUserImageManager() OVERRIDE;
@@ skipping 15 matching lines @@
   MockUserManager* user_manager();
 
  private:
   UserManager* old_user_manager_;
   scoped_ptr<MockUserManager> user_manager_;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_MOCK_USER_MANAGER_H_