Split Blacklist from ExtensionSystem.

chrome/browser/extensions/extension_system_impl.cc

 // Copyright 2014 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/extension_system_impl.h"
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
-#include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/declarative_user_script_master.h"
 #include "chrome/browser/extensions/error_console/error_console.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/navigation_observer.h"
@@ skipping 82 matching lines @@
       profile_->GetPath().AppendASCII(extensions::kStateStoreName),
       true));
   state_store_notification_observer_.reset(
       new StateStoreNotificationObserver(state_store_.get()));
 
   rules_store_.reset(new StateStore(
       profile_,
       profile_->GetPath().AppendASCII(extensions::kRulesStoreName),
       false));
 
-  blacklist_.reset(new Blacklist(ExtensionPrefs::Get(profile_)));
-
 #if defined(OS_CHROMEOS)
   const user_manager::User* user =
       user_manager::UserManager::Get()->GetActiveUser();
   policy::DeviceLocalAccount::Type device_local_account_type;
   if (user && policy::IsDeviceLocalAccountUser(user->email(),
                                                &device_local_account_type)) {
     device_local_account_management_policy_provider_.reset(
         new chromeos::DeviceLocalAccountManagementPolicyProvider(
             device_local_account_type));
   }
@@ skipping 179 matching lines @@
   bool autoupdate_enabled = !profile_->IsGuestSession();
 #if defined(OS_CHROMEOS)
   if (!extensions_enabled)
     autoupdate_enabled = false;
 #endif
   extension_service_.reset(new ExtensionService(
       profile_,
       CommandLine::ForCurrentProcess(),
       profile_->GetPath().AppendASCII(extensions::kInstallDirectoryName),
       ExtensionPrefs::Get(profile_),
-      blacklist_.get(),
+      Blacklist::Get(profile_),
       autoupdate_enabled,
       extensions_enabled,
       &ready_));
 
   // These services must be registered before the ExtensionService tries to
   // load any extensions.
   {
     install_verifier_.reset(
         new InstallVerifier(ExtensionPrefs::Get(profile_), profile_));
     install_verifier_->Init();
@@ skipping 109 matching lines @@
 
 LazyBackgroundTaskQueue*
     ExtensionSystemImpl::Shared::lazy_background_task_queue() {
   return lazy_background_task_queue_.get();
 }
 
 EventRouter* ExtensionSystemImpl::Shared::event_router() {
   return event_router_.get();
 }
 
-Blacklist* ExtensionSystemImpl::Shared::blacklist() {
-  return blacklist_.get();
-}
-
 ErrorConsole* ExtensionSystemImpl::Shared::error_console() {
   return error_console_.get();
 }
 
 InstallVerifier* ExtensionSystemImpl::Shared::install_verifier() {
   return install_verifier_.get();
 }
 
 QuotaService* ExtensionSystemImpl::Shared::quota_service() {
   return quota_service_.get();
@@ skipping 80 matching lines @@
 InfoMap* ExtensionSystemImpl::info_map() { return shared_->info_map(); }
 
 LazyBackgroundTaskQueue* ExtensionSystemImpl::lazy_background_task_queue() {
   return shared_->lazy_background_task_queue();
 }
 
 EventRouter* ExtensionSystemImpl::event_router() {
   return shared_->event_router();
 }
 
-Blacklist* ExtensionSystemImpl::blacklist() {
-  return shared_->blacklist();
-}
-
 const OneShotEvent& ExtensionSystemImpl::ready() const {
   return shared_->ready();
 }
 
 ErrorConsole* ExtensionSystemImpl::error_console() {
   return shared_->error_console();
 }
 
 InstallVerifier* ExtensionSystemImpl::install_verifier() {
   return shared_->install_verifier();
@@ skipping 50 matching lines @@
 void ExtensionSystemImpl::UnregisterExtensionWithRequestContexts(
     const std::string& extension_id,
     const UnloadedExtensionInfo::Reason reason) {
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&InfoMap::RemoveExtension, info_map(), extension_id, reason));
 }
 
 }  // namespace extensions