New authorization framework for sync. ...

chrome/browser/profile_impl.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/profile_impl.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/file_path.h"
@@ skipping 461 matching lines @@
 
   // Remove pref observers.
   PrefService* prefs = GetPrefs();
   prefs->RemovePrefObserver(prefs::kSpellCheckDictionary, this);
   prefs->RemovePrefObserver(prefs::kEnableSpellCheck, this);
   prefs->RemovePrefObserver(prefs::kEnableAutoSpellCorrect, this);
 
   // Delete the NTP resource cache so we can unregister pref observers.
   ntp_resource_cache_.reset();
 
+  // The sync service needs to be deleted before the services it calls.
   sync_service_.reset();
 
   // Both HistoryService and WebDataService maintain threads for background
   // processing. Its possible each thread still has tasks on it that have
   // increased the ref count of the service. In such a situation, when we
   // decrement the refcount, it won't be 0, and the threads/databases aren't
   // properly shut down. By explicitly calling Cleanup/Shutdown we ensure the
   // databases are properly closed.
   if (web_data_service_.get())
     web_data_service_->Shutdown();
@@ skipping 736 matching lines @@
 }
 
 TokenService* ProfileImpl::GetTokenService() {
   if (!token_service_.get()) {
     token_service_.reset(new TokenService());
   }
   return token_service_.get();
 }
 
 ProfileSyncService* ProfileImpl::GetProfileSyncService() {
+  return GetProfileSyncService("");
+}
+
+ProfileSyncService* ProfileImpl::GetProfileSyncService(
+    const std::string& cros_user) {
+
   if (!ProfileSyncService::IsSyncEnabled())
     return NULL;
   if (!sync_service_.get())
-    InitSyncService();
+    InitSyncService(cros_user);
   return sync_service_.get();
 }
 
 CloudPrintProxyService* ProfileImpl::GetCloudPrintProxyService() {
   if (!cloud_print_proxy_service_.get())
     InitCloudPrintProxyService();
   return cloud_print_proxy_service_.get();
 }
 
-void ProfileImpl::InitSyncService() {
+void ProfileImpl::InitSyncService(const std::string& cros_user) {
   profile_sync_factory_.reset(
       new ProfileSyncFactoryImpl(this, CommandLine::ForCurrentProcess()));
   sync_service_.reset(
-      profile_sync_factory_->CreateProfileSyncService());
+      profile_sync_factory_->CreateProfileSyncService(cros_user));
   sync_service_->Initialize();
 }
 
 void ProfileImpl::InitCloudPrintProxyService() {
   cloud_print_proxy_service_.reset(new CloudPrintProxyService(this));
   cloud_print_proxy_service_->Initialize();
 }
 
 ChromeBlobStorageContext* ProfileImpl::GetBlobStorageContext() {
   if (!blob_storage_context_) {
     blob_storage_context_ = new ChromeBlobStorageContext();
     ChromeThread::PostTask(
         ChromeThread::IO, FROM_HERE,
         NewRunnableMethod(blob_storage_context_.get(),
                           &ChromeBlobStorageContext::InitializeOnIOThread));
   }
   return blob_storage_context_;
 }
 
 #if defined(OS_CHROMEOS)
 chromeos::ProxyConfigServiceImpl*
     ProfileImpl::GetChromeOSProxyConfigServiceImpl() {
   if (!chromeos_proxy_config_service_impl_) {
     chromeos_proxy_config_service_impl_ =
         new chromeos::ProxyConfigServiceImpl();
   }
   return chromeos_proxy_config_service_impl_;
 }
 #endif  // defined(OS_CHROMEOS)