Rename SigninManagerDelegate to SigninClient

This renaming puts the Signin embedder interface in line with the agreed-upon
convention wherein a component Foo's embedder interface should be named
FooClient. ChromeSigninManagerDelegate is similarly renamed to
ChromeSigninClient, and variable names are updated.

BUG=334168
TBR=joi

Review URL: https://codereview.chromium.org/192253002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255903 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/signin/chrome_signin_manager_delegate.cc → chrome/browser/signin/chrome_signin_client.cc

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
+#include "chrome/browser/signin/chrome_signin_client.h"
 
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "url/gurl.h"
@@ -13,29 +13,25 @@ const char kGoogleAccountsUrl[] = "https://accounts.google.com";
 
 }  // namespace
 
-ChromeSigninManagerDelegate::ChromeSigninManagerDelegate(Profile* profile)
-    : profile_(profile) {
-}
+ChromeSigninClient::ChromeSigninClient(Profile* profile) : profile_(profile) {}
 
-ChromeSigninManagerDelegate::~ChromeSigninManagerDelegate() {
-}
+ChromeSigninClient::~ChromeSigninClient() {}
 
 // static
-bool ChromeSigninManagerDelegate::ProfileAllowsSigninCookies(Profile* profile) {
+bool ChromeSigninClient::ProfileAllowsSigninCookies(Profile* profile) {
   CookieSettings* cookie_settings =
       CookieSettings::Factory::GetForProfile(profile).get();
   return SettingsAllowSigninCookies(cookie_settings);
 }
 
 // static
-bool ChromeSigninManagerDelegate::SettingsAllowSigninCookies(
+bool ChromeSigninClient::SettingsAllowSigninCookies(
     CookieSettings* cookie_settings) {
   return cookie_settings &&
-      cookie_settings->IsSettingCookieAllowed(GURL(kGoogleAccountsUrl),
-                                              GURL(kGoogleAccountsUrl));
+         cookie_settings->IsSettingCookieAllowed(GURL(kGoogleAccountsUrl),
+                                                 GURL(kGoogleAccountsUrl));
 }
 
-
-bool ChromeSigninManagerDelegate::AreSigninCookiesAllowed() {
+bool ChromeSigninClient::AreSigninCookiesAllowed() {
   return ProfileAllowsSigninCookies(profile_);
 }

chrome/browser/signin/chrome_signin_manager_delegate.h → chrome/browser/signin/chrome_signin_client.h

-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_SIGNIN_CHROME_SIGNIN_MANAGER_DELEGATE_H_
-#define CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_MANAGER_DELEGATE_H_
+#ifndef CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_
+#define CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "components/signin/core/signin_manager_delegate.h"
+#include "components/signin/core/signin_client.h"
 
 class CookieSettings;
 class Profile;
 
-class ChromeSigninManagerDelegate : public SigninManagerDelegate {
+class ChromeSigninClient : public SigninClient {
  public:
-  explicit ChromeSigninManagerDelegate(Profile* profile);
-  virtual ~ChromeSigninManagerDelegate();
+  explicit ChromeSigninClient(Profile* profile);
+  virtual ~ChromeSigninClient();
 
   // Utility methods.
   static bool ProfileAllowsSigninCookies(Profile* profile);
   static bool SettingsAllowSigninCookies(CookieSettings* cookie_settings);
 
-  // SigninManagerDelegate implementation.
+  // SigninClient implementation.
   virtual bool AreSigninCookiesAllowed() OVERRIDE;
 
  private:
@@ -29,7 +29,7 @@ class ChromeSigninManagerDelegate : public SigninManagerDelegate {
   // outlived by Profile.
   Profile* profile_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeSigninManagerDelegate);
+  DISALLOW_COPY_AND_ASSIGN(ChromeSigninClient);
 };
 
-#endif  // CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_MANAGER_DELEGATE_H_
+#endif  // CHROME_BROWSER_SIGNIN_CHROME_SIGNIN_CLIENT_H_

chrome/browser/signin/fake_signin_manager.cc

@@ -8,7 +8,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
+#include "chrome/browser/signin/chrome_signin_client.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
@@ -41,8 +41,7 @@ BrowserContextKeyedService* FakeSigninManagerBase::Build(
 #if !defined (OS_CHROMEOS)
 
 FakeSigninManager::FakeSigninManager(Profile* profile)
-    : SigninManager(scoped_ptr<SigninManagerDelegate>(
-        new ChromeSigninManagerDelegate(profile))) {
+    : SigninManager(scoped_ptr<SigninClient>(new ChromeSigninClient(profile))) {
 }
 
 FakeSigninManager::~FakeSigninManager() {

chrome/browser/signin/signin_manager.cc

@@ -28,8 +28,8 @@
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profile_management_switches.h"
+#include "components/signin/core/signin_client.h"
 #include "components/signin/core/signin_manager_cookie_helper.h"
-#include "components/signin/core/signin_manager_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
@@ -82,14 +82,13 @@ bool SigninManager::IsWebBasedSigninFlowURL(const GURL& url) {
           .find(kChromiumSyncService) != std::string::npos;
 }
 
-SigninManager::SigninManager(scoped_ptr<SigninManagerDelegate> delegate)
+SigninManager::SigninManager(scoped_ptr<SigninClient> client)
     : prohibit_signout_(false),
       had_two_factor_error_(false),
       type_(SIGNIN_TYPE_NONE),
       weak_pointer_factory_(this),
       signin_host_id_(ChildProcessHost::kInvalidUniqueID),
-      delegate_(delegate.Pass()) {
-}
+      client_(client.Pass()) {}
 
 void SigninManager::SetSigninProcess(int process_id) {
   if (process_id == signin_host_id_)

chrome/browser/signin/signin_manager.h

@@ -47,7 +47,7 @@ class ProfileIOData;
 class PrefService;
 class SigninAccountIdHelper;
 class SigninGlobalError;
-class SigninManagerDelegate;
+class SigninClient;
 
 class SigninManager : public SigninManagerBase,
                       public GaiaAuthConsumer,
@@ -70,7 +70,7 @@ class SigninManager : public SigninManagerBase,
   // OneClickSigninHelper.
   static const char* kChromeSigninEffectiveSite;
 
-  explicit SigninManager(scoped_ptr<SigninManagerDelegate> delegate);
+  explicit SigninManager(scoped_ptr<SigninClient> client);
   virtual ~SigninManager();
 
   // Returns true if the username is allowed based on the policy string.
@@ -286,7 +286,7 @@ class SigninManager : public SigninManagerBase,
   // but before signin is complete.
   OAuthTokenFetchedCallback oauth_token_fetched_callback_;
 
-  scoped_ptr<SigninManagerDelegate> delegate_;
+  scoped_ptr<SigninClient> client_;
 
   // Helper object to listen for changes to signin preferences stored in non-
   // profile-specific local prefs (like kGoogleServicesUsernamePattern).

chrome/browser/signin/signin_manager_factory.cc

@@ -6,7 +6,7 @@
 
 #include "base/prefs/pref_registry_simple.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
+#include "chrome/browser/signin/chrome_signin_client.h"
 #include "chrome/browser/signin/local_auth.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
@@ -127,8 +127,7 @@ BrowserContextKeyedService* SigninManagerFactory::BuildServiceInstanceFor(
   service = new SigninManagerBase();
 #else
   service = new SigninManager(
-      scoped_ptr<SigninManagerDelegate>(
-          new ChromeSigninManagerDelegate(profile)));
+      scoped_ptr<SigninClient>(new ChromeSigninClient(profile)));
 #endif
   service->Initialize(profile, g_browser_process->local_state());
   FOR_EACH_OBSERVER(Observer, observer_list_, SigninManagerCreated(service));

chrome/browser/signin/signin_manager_unittest.cc

@@ -14,7 +14,7 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/prefs/browser_prefs.h"
-#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
+#include "chrome/browser/signin/chrome_signin_client.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service.h"
 #include "chrome/browser/signin/fake_profile_oauth2_token_service_wrapper.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
@@ -55,8 +55,7 @@ BrowserContextKeyedService* SigninManagerBuild(
   SigninManager* service = NULL;
   Profile* profile = static_cast<Profile*>(context);
   service = new SigninManager(
-      scoped_ptr<SigninManagerDelegate>(
-          new ChromeSigninManagerDelegate(profile)));
+      scoped_ptr<SigninClient>(new ChromeSigninClient(profile)));
   service->Initialize(profile, NULL);
   return service;
 }
@@ -147,8 +146,7 @@ class SigninManagerTest : public testing::Test {
   void CreateNakedSigninManager() {
     DCHECK(!manager_);
     naked_manager_.reset(new SigninManager(
-        scoped_ptr<SigninManagerDelegate>(
-            new ChromeSigninManagerDelegate(profile()))));
+        scoped_ptr<SigninClient>(new ChromeSigninClient(profile()))));
 
     manager_ = naked_manager_.get();
     manager_->AddObserver(&test_observer_);

chrome/browser/ui/sync/one_click_signin_helper.cc

@@ -35,7 +35,7 @@
 #include "chrome/browser/profiles/profile_io_data.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/search/search.h"
-#include "chrome/browser/signin/chrome_signin_manager_delegate.h"
+#include "chrome/browser/signin/chrome_signin_client.h"
 #include "chrome/browser/signin/signin_global_error.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
@@ -60,7 +60,7 @@
 #include "chrome/common/url_constants.h"
 #include "components/autofill/core/common/password_form.h"
 #include "components/password_manager/core/browser/password_manager.h"
-#include "components/signin/core/signin_manager_delegate.h"
+#include "components/signin/core/signin_client.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/page_navigator.h"
@@ -697,7 +697,7 @@ bool OneClickSigninHelper::CanOffer(content::WebContents* web_contents,
       !profile->GetPrefs()->GetBoolean(prefs::kReverseAutologinEnabled))
     return false;
 
-  if (!ChromeSigninManagerDelegate::ProfileAllowsSigninCookies(profile))
+  if (!ChromeSigninClient::ProfileAllowsSigninCookies(profile))
     return false;
 
   if (!email.empty()) {
@@ -801,7 +801,7 @@ OneClickSigninHelper::Offer OneClickSigninHelper::CanOfferOnIOThreadImpl(
   if (!io_data->google_services_username()->GetValue().empty())
     return DONT_OFFER;
 
-  if (!ChromeSigninManagerDelegate::SettingsAllowSigninCookies(
+  if (!ChromeSigninClient::SettingsAllowSigninCookies(
           io_data->GetCookieSettings()))
     return DONT_OFFER;
 

chrome/chrome_browser.gypi

@@ -2102,8 +2102,8 @@
         'browser/signin/account_reconcilor.h',
         'browser/signin/account_reconcilor_factory.cc',
         'browser/signin/account_reconcilor_factory.h',
-        'browser/signin/chrome_signin_manager_delegate.cc',
-        'browser/signin/chrome_signin_manager_delegate.h',
+        'browser/signin/chrome_signin_client.cc',
+        'browser/signin/chrome_signin_client.h',
         'browser/signin/local_auth.cc',
         'browser/signin/local_auth.h',
         'browser/signin/mutable_profile_oauth2_token_service.cc',

components/signin.gypi

@@ -17,9 +17,9 @@
         '..',
       ],
       'sources': [
+        'signin/core/signin_client.h',
         'signin/core/signin_manager_cookie_helper.cc',
         'signin/core/signin_manager_cookie_helper.h',
-        'signin/core/signin_manager_delegate.h',
         'signin/core/webdata/token_service_table.cc',
         'signin/core/webdata/token_service_table.h',
         'signin/core/webdata/token_web_data.cc',

components/signin/core/signin_manager_delegate.h → components/signin/core/signin_client.h

@@ -2,18 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_SIGNIN_CORE_SIGNIN_MANAGER_DELEGATE_H_
-#define COMPONENTS_SIGNIN_CORE_SIGNIN_MANAGER_DELEGATE_H_
+#ifndef COMPONENTS_SIGNIN_CORE_SIGNIN_CLIENT_H_
+#define COMPONENTS_SIGNIN_CORE_SIGNIN_CLIENT_H_
 
-// A delegate interface that needs to be supplied to the Signin component by
-// its embedder.
-class SigninManagerDelegate {
+// An interface that needs to be supplied to the Signin component by its
+// embedder.
+class SigninClient {
  public:
-  virtual ~SigninManagerDelegate() {}
+  virtual ~SigninClient() {}
 
   // Returns true if the cookie policy for the execution context of
   // the SigninManager allows cookies for the Google signin domain.
   virtual bool AreSigninCookiesAllowed() = 0;
 };
 
-#endif  // COMPONENTS_SIGNIN_CORE_SIGNIN_MANAGER_DELEGATE_H_
+#endif  // COMPONENTS_SIGNIN_CORE_SIGNIN_CLIENT_H_