Add the TokenService to the chrome profile

chrome/browser/sync/profile_sync_service.cc

 // Copyright (c) 2010 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/sync/profile_sync_service.h"
 
 #include <map>
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
+#include "chrome/browser/net/gaia/token_service.h"
 #include "chrome/browser/sync/engine/syncapi.h"
 #include "chrome/browser/sync/glue/change_processor.h"
 #include "chrome/browser/sync/glue/data_type_controller.h"
 #include "chrome/browser/sync/glue/data_type_manager.h"
 #include "chrome/browser/sync/profile_sync_factory.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
@@ skipping 90 matching lines @@
   InitSettings();
   RegisterPreferences();
 
   if (!profile()->GetPrefs()->GetBoolean(prefs::kSyncHasSetupCompleted)) {
     DisableForUser();  // Clean up in case of previous crash / setup abort.
 
     // Automatically start sync in Chromium OS.
     if (bootstrap_sync_authentication_) {
       // If the LSID is empty, we're in a CrOS UI test that is not testing sync
       // behavior, so we don't want the sync service to start.
-      if (GetLsidForAuthBootstraping().empty()) {
+      if (profile()->GetTokenService() &&
+          !profile()->GetTokenService()->HasLsid()) {
         LOG(WARNING) << "Skipping CrOS sync startup, no LSID present.";
         return;
       }
       StartUp();
     }
   } else {
     StartUp();
   }
 }
 
@@ skipping 74 matching lines @@
 
 void ProfileSyncService::ClearPreferences() {
   PrefService* pref_service = profile_->GetPrefs();
   pref_service->ClearPref(prefs::kSyncLastSyncedTime);
   pref_service->ClearPref(prefs::kSyncHasSetupCompleted);
   // TODO(nick): The current behavior does not clear e.g. prefs::kSyncBookmarks.
   // Is that really what we want?
   pref_service->ScheduleSavePersistentPrefs();
 }
 
-// The domain and name of the LSID cookie which we use to bootstrap the sync
-// authentication in Chromium OS.
-const char kLsidCookieDomain[] = "www.google.com";
-const char kLsidCookieName[]   = "LSID";
-
-std::string ProfileSyncService::GetLsidForAuthBootstraping() {
-  if (bootstrap_sync_authentication_ && profile()->GetRequestContext()) {
-    // If we're running inside Chromium OS, bootstrap the sync authentication by
-    // using the LSID cookie provided by the Chromium OS login manager.
-    net::CookieMonster::CookieList cookies = profile()->GetRequestContext()->
-        GetCookieStore()->GetCookieMonster()->GetAllCookies();
-    for (net::CookieMonster::CookieList::const_iterator it = cookies.begin();
-         it != cookies.end(); ++it) {
-      if (kLsidCookieDomain == it->first) {
-        const net::CookieMonster::CanonicalCookie& cookie = it->second;
-        if (kLsidCookieName == cookie.Name()) {
-          return cookie.Value();
-        }
-      }
-    }
-  }
-  return std::string();
-}
-
 void ProfileSyncService::InitializeBackend(bool delete_sync_data_folder) {
   if (!backend_.get()) {
     NOTREACHED();
     return;
   }
 
   bool invalidate_sync_login = false;
   bool invalidate_sync_xmpp_login = false;
 #if !defined(NDEBUG)
   invalidate_sync_login = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kInvalidateSyncLogin);
   invalidate_sync_xmpp_login = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kInvalidateSyncXmppLogin);
 #endif
 
   syncable::ModelTypeSet types;
   // If sync setup hasn't finished, we don't want to initialize routing info
   // for any data types so that we don't download updates for types that the
   // user chooses not to sync on the first DownloadUpdatesCommand.
   if (HasSyncSetupCompleted())
     GetPreferredDataTypes(&types);
   backend_->Initialize(sync_service_url_,
                        types,
                        profile_->GetRequestContext(),
-                       GetLsidForAuthBootstraping(),
+                       profile_->GetTokenService()->GetLsid(),
                        delete_sync_data_folder,
                        invalidate_sync_login,
                        invalidate_sync_xmpp_login,
                        notification_method_);
 }
 
 void ProfileSyncService::StartUp() {
   // Don't start up multiple times.
   if (backend_.get()) {
     LOG(INFO) << "Skipping bringing up backend host.";
@@ skipping 492 matching lines @@
   // is initialized, all enabled data types are consistent with one
   // another, and no unrecoverable error has transpired.
   if (unrecoverable_error_detected_)
     return false;
 
   if (!data_type_manager_.get())
     return false;
 
   return data_type_manager_->state() == DataTypeManager::CONFIGURED;
 }