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

chrome/browser/sync/test/integration/sync_app_helper.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/test/integration/sync_app_helper.h"
 
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_sorting.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/extensions_helper.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_extension_helper.h"
 #include "chrome/common/string_ordinal.h"
 
 namespace {
 
 struct AppState {
@@ skipping 65 matching lines @@
   SyncAppHelper* instance = Singleton<SyncAppHelper>::get();
   instance->SetupIfNecessary(sync_datatype_helper::test());
   return instance;
 }
 
 void SyncAppHelper::SetupIfNecessary(SyncTest* test) {
   if (setup_completed_)
     return;
 
   for (int i = 0; i < test->num_clients(); ++i) {
-    ExtensionSystemFactory::GetForProfile(test->GetProfile(i))->Init(true);
+    test->GetProfile(i)->InitExtensions(true);
   }
-  ExtensionSystemFactory::GetForProfile(test->verifier())->Init(true);
+  test->verifier()->InitExtensions(true);
 
   setup_completed_ = true;
 }
 
 bool SyncAppHelper::AppStatesMatch(Profile* profile1, Profile* profile2) {
   if (!SyncExtensionHelper::GetInstance()->ExtensionStatesMatch(
           profile1, profile2))
     return false;
 
   const AppStateMap& state_map1 = GetAppStates(profile1);
@@ skipping 61 matching lines @@
 }
 
 void SyncAppHelper::FixNTPOrdinalCollisions(Profile* profile) {
   profile->GetExtensionService()->extension_prefs()->
       extension_sorting()->FixNTPOrdinalCollisions();
 }
 
 SyncAppHelper::SyncAppHelper() : setup_completed_(false) {}
 
 SyncAppHelper::~SyncAppHelper() {}