Introduce SigninManagerDelegate and use to eliminate CookieSettings dependency.

chrome/browser/ui/sync/one_click_signin_helper.cc

 // 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.
 
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 
 #include <algorithm>
 #include <functional>
 #include <utility>
 #include <vector>
@@ skipping 13 matching lines @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #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/signin_manager.h"
+#include "chrome/browser/signin/signin_manager_delegate.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_names_io_thread.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_prefs.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/sync/one_click_signin_histogram.h"
@@ skipping 432 matching lines @@
 
   SigninManager* manager =
       SigninManagerFactory::GetForProfile(profile);
   if (manager && !manager->IsSigninAllowed())
     return false;
 
   if (can_offer_for == CAN_OFFER_FOR_INTERSTITAL_ONLY &&
       !profile->GetPrefs()->GetBoolean(prefs::kReverseAutologinEnabled))
     return false;
 
-  if (!SigninManager::AreSigninCookiesAllowed(profile))
+  if (!ChromeSigninManagerDelegate::ProfileAllowsSigninCookies(profile))
     return false;
 
   if (!email.empty()) {
     if (!manager)
       return false;
 
     // If the signin manager already has an authenticated name, then this is a
     // re-auth scenario.  Make sure the email just signed in corresponds to the
     // the one sign in manager expects.
     std::string current_email = manager->GetAuthenticatedUsername();
@@ skipping 103 matching lines @@
 
   if (!SigninManager::IsSigninAllowedOnIOThread(io_data))
     return DONT_OFFER;
 
   if (!io_data->reverse_autologin_enabled()->GetValue())
     return DONT_OFFER;
 
   if (!io_data->google_services_username()->GetValue().empty())
     return DONT_OFFER;
 
-  if (!SigninManager::AreSigninCookiesAllowed(io_data->GetCookieSettings()))
+  if (!ChromeSigninManagerDelegate::SettingsAllowSigninCookies(
+          io_data->GetCookieSettings()))
     return DONT_OFFER;
 
   // The checks below depend on chrome already knowing what account the user
   // signed in with.  This happens only after receiving the response containing
   // the Google-Accounts-SignIn header.  Until then, if there is even a chance
   // that we want to connect the profile, chrome needs to tell Gaia that
   // it should offer the interstitial.  Therefore missing one click data on
   // the request means can offer is true.
   const std::string& pending_email = io_data->reverse_autologin_pending_email();
   if (!pending_email.empty()) {
@@ skipping 632 matching lines @@
     }
   }
   ShowSyncConfirmationBubble(display_bubble);
   signin_tracker_.reset();
 }
 
 void OneClickSigninHelper::SigninSuccess() {
   ShowSyncConfirmationBubble(true);
   signin_tracker_.reset();
 }