Revert 124787 - Merge 124527 - Pre-login should not set cookies and log the user in of cookies are not

enabled for google accounts.

BUG=None
TEST=Create a new profile.  Go to content settings and block all sites from
setting data.  Alternatively, block only the https://accounts.google.com from
setting data.  Now connect the profile a google account.  The browser should
not be logged (i.e. going to gmail should not show the inbox).  Looking at
all cookie and site data should show no cookies for accounts.google.com.

Review URL: http://codereview.chromium.org/9549026

TBR=rogerta@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9588004

TBR=rogerta@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9594019

git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@124938 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 14 deletions

diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index fa571a1..b7cc0bb 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -6,7 +6,6 @@
 
 #include "base/command_line.h"
 #include "base/string_util.h"
-#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
@@ -20,8 +19,6 @@
 
 const char kGetInfoEmailKey[] = "email";
 
-const char kGoogleAccountsUrl[] = "https://accounts.google.com";
-
 SigninManager::SigninManager()
     : profile_(NULL),
       had_two_factor_error_(false),
@@ -136,18 +133,11 @@ void SigninManager::StartSignIn(const std::string& username,
 
   // Register for token availability.  The signin manager will pre-login the
   // user when the GAIA service token is ready for use.  Only do this if we
-  // are not running in ChomiumOS, since it handles pre-login itself, and if
-  // cookies are not disabled for Google accounts.
+  // are not running in ChomiumOS, since it handles pre-login itself.
 #if !defined(OS_CHROMEOS)
-  CookieSettings* cookie_settings =
-      CookieSettings::Factory::GetForProfile(profile_);
-  if (cookie_settings &&
-      cookie_settings->IsSettingCookieAllowed(GURL(kGoogleAccountsUrl),
-                                              GURL(kGoogleAccountsUrl))) {
-    registrar_.Add(this,
-                   chrome::NOTIFICATION_TOKEN_AVAILABLE,
-                   content::Source<TokenService>(profile_->GetTokenService()));
-  }
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_TOKEN_AVAILABLE,
+                 content::Source<TokenService>(profile_->GetTokenService()));
 #endif
 }