Reland 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem.

chrome/browser/sync/profile_sync_service_factory.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/sync/profile_sync_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/defaults.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/sessions/tab_restore_service_factory.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_components_factory_impl.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
@@ skipping 20 matching lines @@
                                  ProfileDependencyManager::GetInstance()) {
 
   // The ProfileSyncService depends on various SyncableServices being around
   // when it is shut down.  Specify those dependencies here to build the proper
   // destruction order.
   DependsOn(TemplateURLServiceFactory::GetInstance());
   DependsOn(PersonalDataManagerFactory::GetInstance());
   DependsOn(ThemeServiceFactory::GetInstance());
   DependsOn(GlobalErrorServiceFactory::GetInstance());
   DependsOn(SigninManagerFactory::GetInstance());
+  DependsOn(ExtensionSystemFactory::GetInstance());
 
   // The following have not been converted to ProfileKeyedServices yet, and for
   // now they are explicitly destroyed after the ProfileDependencyManager is
   // told to DestroyProfileServices, so they will be around when the
   // ProfileSyncService is destroyed.
 
   // DependsOn(WebDataServiceFactory::GetInstance());
   // DependsOn(HistoryServiceFactory::GetInstance());
   // DependsOn(BookmarkBarModelFactory::GetInstance());
   // DependsOn(FaviconServiceFactory::GetInstance());
   // DependsOn(PasswordStoreService::GetInstance());
-  // DependsOn(ExtensionServiceFactory::GetInstance());
 }
 
 ProfileSyncServiceFactory::~ProfileSyncServiceFactory() {
 }
 
 ProfileKeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor(
     Profile* profile) const {
   ProfileSyncService::StartBehavior behavior =
       browser_defaults::kSyncAutoStarts ? ProfileSyncService::AUTO_START
                                         : ProfileSyncService::MANUAL_START;
@@ skipping 15 matching lines @@
 
   pss->factory()->RegisterDataTypes(pss);
   pss->Initialize();
   return pss;
 }
 
 // static
 bool ProfileSyncServiceFactory::HasProfileSyncService(Profile* profile) {
   return GetInstance()->GetServiceForProfile(profile, false) != NULL;
 }