Add PolicyProvider to ExtensionManagement

chrome/browser/extensions/test_extension_system.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/extensions/test_extension_system.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/declarative_user_script_master.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
+#include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/shared_module_service.h"
-#include "chrome/browser/extensions/standard_management_policy_provider.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/browser_thread.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_pref_value_map.h"
 #include "extensions/browser/extension_pref_value_map_factory.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_prefs_factory.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
@@ skipping 14 matching lines @@
     : profile_(profile),
       value_store_(NULL),
       info_map_(new InfoMap()),
       error_console_(new ErrorConsole(profile)),
       quota_service_(new QuotaService()) {}
 
 TestExtensionSystem::~TestExtensionSystem() {
 }
 
 void TestExtensionSystem::Shutdown() {
   process_manager_.reset();

[Joao da Silva, 2014/09/03 11:52:54]

The ObserverList failure at shutdown may be because this method isn't forwarding
to extension_service_->Shutdown

[binjin, 2014/09/03 15:31:36]

Done.

 }
 
 void TestExtensionSystem::CreateProcessManager() {
   process_manager_.reset(ProcessManager::Create(profile_));
 }
 
 void TestExtensionSystem::SetProcessManager(ProcessManager* manager) {
   process_manager_.reset(manager);
 }
 
@@ skipping 29 matching lines @@
     CreateExtensionPrefs(command_line, install_directory);
   install_verifier_.reset(
       new InstallVerifier(ExtensionPrefs::Get(profile_), profile_));
   // The ownership of |value_store_| is immediately transferred to state_store_,
   // but we keep a naked pointer to the TestingValueStore.
   scoped_ptr<TestingValueStore> value_store(new TestingValueStore());
   value_store_ = value_store.get();
   state_store_.reset(
       new StateStore(profile_, value_store.PassAs<ValueStore>()));
   blacklist_.reset(new Blacklist(ExtensionPrefs::Get(profile_)));
-  standard_management_policy_provider_.reset(
-      new StandardManagementPolicyProvider(ExtensionPrefs::Get(profile_)));
   management_policy_.reset(new ManagementPolicy());
   management_policy_->RegisterProvider(
-      standard_management_policy_provider_.get());
+      ExtensionManagementFactory::GetForBrowserContext(profile_)
+          ->GetProvider());
   runtime_data_.reset(new RuntimeData(ExtensionRegistry::Get(profile_)));
   extension_service_.reset(new ExtensionService(profile_,
                                                 command_line,
                                                 install_directory,
                                                 ExtensionPrefs::Get(profile_),
                                                 blacklist_.get(),
                                                 autoupdate_enabled,
                                                 true,
                                                 &ready_));
   extension_service_->ClearProvidersForTesting();
@@ skipping 99 matching lines @@
   }
   return master;
 }
 
 // static
 KeyedService* TestExtensionSystem::Build(content::BrowserContext* profile) {
   return new TestExtensionSystem(static_cast<Profile*>(profile));
 }
 
 }  // namespace extensions