Revert 183647

chrome/browser/chromeos/login/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_USER_MANAGER_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_
 
 #include <string>
 
 #include "base/memory/singleton.h"
 #include "chrome/browser/chromeos/login/user.h"
 
 class PrefService;
 
 namespace chromeos {
 
 class RemoveUserDelegate;
 class UserImageManager;
 
 // Base class for UserManagerImpl - provides a mechanism for discovering users
 // who have logged into this Chrome OS device before and updating that list.
 class UserManager {
  public:
-  // Status of merge sessions process which is responsible for exchanging
-  // user OAuth2 refresh token for GAIA cookies.
-  enum MergeSessionState {
-    // Session merge hasn't started yet.
-    MERGE_STATUS_NOT_STARTED,
-    // Session merge is in process.
-    MERGE_STATUS_IN_PROCESS,
-    // Session merge is completed.
-    MERGE_STATUS_DONE,
-  };
-
   // Interface that observers of UserManager must implement in order
   // to receive notification when local state preferences is changed
   class Observer {
    public:
-    // Called when the local state preferences is changed.
+    // Called when the local state preferences is changed
     virtual void LocalStateChanged(UserManager* user_manager) = 0;
 
-    // Called when merge session state is changed.
-    virtual void MergeSessionStateChanged(MergeSessionState state) {}
-
    protected:
     virtual ~Observer() {}
   };
 
   // Username for stub login when not running on ChromeOS.
   static const char kStubUser[];
 
   // Returns a shared instance of a UserManager. Not thread-safe, should only be
   // called from the main UI thread.
   static UserManager* Get();
@@ skipping 142 matching lines @@
   virtual bool IsLoggedInAsGuest() const = 0;
 
   // Returns true if we're logged in as the stub user used for testing on Linux.
   virtual bool IsLoggedInAsStub() const = 0;
 
   // Returns true if we're logged in and browser has been started i.e.
   // browser_creator.LaunchBrowser(...) was called after sign in
   // or restart after crash.
   virtual bool IsSessionStarted() const = 0;
 
-  // Returns merge session status.
-  virtual MergeSessionState GetMergeSessionState() const = 0;
-
-  // Changes merge session status.
-  virtual void SetMergeSessionState(MergeSessionState status) = 0;
-
   // Returns true when the browser has crashed and restarted during the current
   // user's session.
   virtual bool HasBrowserRestarted() const = 0;
 
   // Returns true if data stored or cached for the user with the given email
   // address outside that user's cryptohome (wallpaper, avatar, OAuth token
   // status, display name, display email) is to be treated as ephemeral.
   virtual bool IsUserNonCryptohomeDataEphemeral(
       const std::string& email) const = 0;
 
   virtual void AddObserver(Observer* obs) = 0;
   virtual void RemoveObserver(Observer* obs) = 0;
 
   virtual void NotifyLocalStateChanged() = 0;
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USER_MANAGER_H_