Pre-login should not set cookies and log the user in of cookies are not

chrome/browser/signin/signin_manager.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/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/string_split.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"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_service.h"
 
 const char kGetInfoEmailKey[] = "email";
 const char kGetInfoServicesKey[] = "allServices";
 const char kGooglePlusServiceKey[] = "googleme";
 
+const char kGoogleAccountsUrl[] = "https://accounts.google.com";
+
 SigninManager::SigninManager()
     : profile_(NULL),
       had_two_factor_error_(false),
       last_login_auth_error_(GoogleServiceAuthError::None()) {
 }
 
 SigninManager::~SigninManager() {}
 
 void SigninManager::Initialize(Profile* profile) {
   // Should never call Initialize() twice.
@@ skipping 74 matching lines @@
                                           profile_->GetRequestContext()));
   client_login_->StartClientLogin(username,
                                   password,
                                   "",
                                   login_token,
                                   login_captcha,
                                   GaiaAuthFetcher::HostedAccountsNotAllowed);
 
   // 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.
+  // are not running in ChomiumOS, since it handles pre-login itself, and if
+  // cookies are not disabled for Google accounts.
 #if !defined(OS_CHROMEOS)
+  CookieSettings* cookie_settings =
+      CookieSettings::Factory::GetForProfile(profile_);
+  if (cookie_settings->IsReadingCookieAllowed(GURL(kGoogleAccountsUrl),

[jochen (gone - plz use gerrit), 2012/03/01 08:27:58]

IsSettingCookieAllowed is enough. Also, please use kGoogleAccountsUrl for both
arguments

[Roger Tawa OOO till Jul 10th, 2012/03/01 16:53:36]

Done.  I added a check against null pointer too.

+                                              GURL("")) &&
+      cookie_settings->IsSettingCookieAllowed(GURL(kGoogleAccountsUrl),
+                                              GURL(""))) {
   registrar_.Add(this,
                  chrome::NOTIFICATION_TOKEN_AVAILABLE,
                  content::Source<TokenService>(profile_->GetTokenService()));
+  }
 #endif
 }
 
 void SigninManager::ProvideSecondFactorAccessCode(
     const std::string& access_code) {
   DCHECK(!possibly_invalid_username_.empty() && !password_.empty() &&
       last_result_.data.empty());
 
   client_login_.reset(new GaiaAuthFetcher(this,
                                           GaiaConstants::kChromeSource,
@@ skipping 149 matching lines @@
                                               profile_->GetRequestContext()));
     }
 
     client_login_->StartMergeSession(tok_details->token());
 
     // We only want to do this once per sign-in.
     CleanupNotificationRegistration();
   }
 #endif
 }