signin: move SigninManagerBase::Signout to SigninManager.

chrome/browser/signin/signin_manager_base.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.
 //
 // The signin manager encapsulates some functionality tracking
 // which user is signed in.
 //
 // **NOTE** on semantics of SigninManager:
 //
 // Once a signin is successful, the username becomes "established" and will not
@@ skipping 49 matching lines @@
   std::string username;
 };
 
 class SigninManagerBase : public ProfileKeyedService {
  public:
   // Returns true if the cookie policy for the given profile allows cookies
   // for the Google signin domain.
   static bool AreSigninCookiesAllowed(Profile* profile);
   static bool AreSigninCookiesAllowed(CookieSettings* cookie_settings);
 
-  // Returns true if the username is allowed based on the policy string.
-  static bool IsAllowedUsername(const std::string& username,
-                                const std::string& policy);
-
   SigninManagerBase();
   virtual ~SigninManagerBase();
 
   // If user was signed in, load tokens from DB if available.
-  void Initialize(Profile* profile);
+  virtual void Initialize(Profile* profile);
   bool IsInitialized() const;
 
-  // Returns true if the passed username is allowed by policy. Virtual for
-  // mocking in tests.
-  virtual bool IsAllowedUsername(const std::string& username) const;
-
   // Returns true if a signin to Chrome is allowed (by policy or pref).
-  bool IsSigninAllowed() const;
-
-  // Checks if signin is allowed for the profile that owns |io_data|. This must
-  // be invoked on the IO thread, and can be used to check if signin is enabled
-  // on that thread.
-  static bool IsSigninAllowedOnIOThread(ProfileIOData* io_data);
+  // TODO(tim): If the kSigninAllowed pref was non-Chrome OS-only, this

[Andrew T Wilson (Slow), 2013/05/06 09:06:00]

I'm confused by this comment. I believe that kSigninAllowed is only supported on
non-ChromeOS platforms (i.e. IsSigninAllowed() should not be called on ChromeOS
since it's meaningless on that platform). Can you clarify the wording?

Maybe add a TODO/log a bug to move this to SigninManager too?

[tim (not reviewing), 2013/05/06 17:28:57]

Done. Using bug 174927.

+  // method wouldn't be needed, but as is we provide this method to let all
+  // interested code query the value in one way, versus half using PrefService
+  // directly and the other half using SigninManager.
+  virtual bool IsSigninAllowed() const;
 
   // If a user has previously established a username and SignOut has not been
   // called, this will return the username.
   // Otherwise, it will return an empty string.
   const std::string& GetAuthenticatedUsername() const;
 
   // Sets the user name.  Note: |username| should be already authenticated as
   // this is a sticky operation (in contrast to StartSignIn).
   // TODO(tim): Remove this in favor of passing username on construction by
   // (by platform / depending on StartBehavior). Bug 88109.
   void SetAuthenticatedUsername(const std::string& username);
 
-  // Sign a user out, removing the preference, erasing all keys
-  // associated with the user, and canceling all auth in progress.
-  // TODO(tim): Remove SignOut here, it belongs in the derived class.
-  // Bug 174927.
-  virtual void SignOut();
-
   // Returns true if there's a signin in progress.
   virtual bool AuthInProgress() const;
 
   SigninGlobalError* signin_global_error() {
     return signin_global_error_.get();
   }
 
   const SigninGlobalError* signin_global_error() const {
     return signin_global_error_.get();
   }
 
   // ProfileKeyedService implementation.
   virtual void Shutdown() OVERRIDE;
 
     // Methods to register or remove SigninDiagnosticObservers
   void AddSigninDiagnosticsObserver(
       signin_internals_util::SigninDiagnosticsObserver* observer);
   void RemoveSigninDiagnosticsObserver(
       signin_internals_util::SigninDiagnosticsObserver* observer);
 
  protected:
   // Lets different platforms initialize TokenService in their own way.
   virtual void InitTokenService();
 
+  void clear_authenticated_username();

[Andrew T Wilson (Slow), 2013/05/06 09:06:00]

Should document here why one would call this and not SetAuthenticatedUsername().

[tim (not reviewing), 2013/05/06 17:28:57]

Done.

+
   // Pointer to parent profile (protected so FakeSigninManager can access
   // it).
   Profile* profile_;
 
   // Used to show auth errors in the wrench menu. The SigninGlobalError is
   // different than most GlobalErrors in that its lifetime is controlled by
   // SigninManager (so we can expose a reference for use in the wrench menu).
   scoped_ptr<SigninGlobalError> signin_global_error_;
 
   // Helper methods to notify all registered diagnostics observers with.
   void NotifyDiagnosticsObservers(
       const signin_internals_util::UntimedSigninStatusField& field,
       const std::string& value);
   void NotifyDiagnosticsObservers(
       const signin_internals_util::TimedSigninStatusField& field,
       const std::string& value);
 
  private:
   friend class FakeSigninManagerBase;
   friend class FakeSigninManager;
-  void OnGoogleServicesUsernamePatternChanged();
-
-  void OnSigninAllowedPrefChanged();
-
-  // Helper object to listen for changes to signin preferences stored in non-
-  // profile-specific local prefs (like kGoogleServicesUsernamePattern).
-  PrefChangeRegistrar local_state_pref_registrar_;
-
-  // Helper object to listen for changes to the signin allowed preference.
-  BooleanPrefMember signin_allowed_;
 
   // Actual username after successful authentication.
   std::string authenticated_username_;
 
   // The list of SigninDiagnosticObservers.
   ObserverList<signin_internals_util::SigninDiagnosticsObserver, true>
       signin_diagnostics_observers_;
 
   base::WeakPtrFactory<SigninManagerBase> weak_pointer_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SigninManagerBase);
 };
 
 #endif  // CHROME_BROWSER_SIGNIN_SIGNIN_MANAGER_BASE_H_