Move ExtensionWarningService and ExtensionsWarningSet to extensions.

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_service.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/extensions/extension_warning_badge_service.h"
-#include "chrome/browser/extensions/extension_warning_set.h"
 #include "chrome/browser/extensions/install_verifier.h"
 #include "chrome/browser/extensions/navigation_observer.h"
 #include "chrome/browser/extensions/shared_module_service.h"
 #include "chrome/browser/extensions/shared_user_script_master.h"
 #include "chrome/browser/extensions/standard_management_policy_provider.h"
 #include "chrome/browser/extensions/state_store_notification_observer.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/extensions/updater/manifest_fetch_data.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ skipping 14 matching lines @@
 #include "extensions/browser/extension_pref_value_map_factory.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/lazy_background_task_queue.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/browser/state_store.h"
+#include "extensions/browser/warning_set.h"

[James Cook, 2014/08/26 22:01:31]

nit: Should this also include warning_service.h?

[Xi Han, 2014/08/27 13:32:54]

Added.

 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 #include "net/base/escape.h"
 
 #if defined(ENABLE_NOTIFICATIONS)
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "ui/message_center/notifier_settings.h"
 #endif
@@ skipping 304 matching lines @@
       base::ThreadRestrictions::ScopedAllowIO allow_io;
       extension_service_->component_loader()->AddOrReplace(
           base::FilePath(t.token()));
     }
   }
   extension_service_->Init();
 
   // Make the chrome://extension-icon/ resource available.
   content::URLDataSource::Add(profile_, new ExtensionIconSource(profile_));
 
-  extension_warning_service_.reset(new ExtensionWarningService(profile_));
+  extension_warning_service_.reset(new WarningService(profile_));

[James Cook, 2014/08/26 22:01:31]

nit: I would rename the variable to just warning_service_

[Xi Han, 2014/08/27 13:32:54]

Done.

   extension_warning_badge_service_.reset(
       new ExtensionWarningBadgeService(profile_));
   extension_warning_service_->AddObserver(
       extension_warning_badge_service_.get());
   error_console_.reset(new ErrorConsole(profile_));
   quota_service_.reset(new QuotaService);
 
   if (extensions_enabled) {
     // Load any extensions specified with --load-extension.
     // TODO(yoz): Seems like this should move into ExtensionService::Init.
@@ skipping 57 matching lines @@
 
 LazyBackgroundTaskQueue*
     ExtensionSystemImpl::Shared::lazy_background_task_queue() {
   return lazy_background_task_queue_.get();
 }
 
 EventRouter* ExtensionSystemImpl::Shared::event_router() {
   return event_router_.get();
 }
 
-ExtensionWarningService* ExtensionSystemImpl::Shared::warning_service() {
+WarningService* ExtensionSystemImpl::Shared::warning_service() {
   return extension_warning_service_.get();
 }
 
 Blacklist* ExtensionSystemImpl::Shared::blacklist() {
   return blacklist_.get();
 }
 
 ErrorConsole* ExtensionSystemImpl::Shared::error_console() {
   return error_console_.get();
 }
@@ skipping 97 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();
 }
 
-ExtensionWarningService* ExtensionSystemImpl::warning_service() {
+WarningService* ExtensionSystemImpl::warning_service() {
   return shared_->warning_service();
 }
 
 Blacklist* ExtensionSystemImpl::blacklist() {
   return shared_->blacklist();
 }
 
 const OneShotEvent& ExtensionSystemImpl::ready() const {
   return shared_->ready();
 }
@@ skipping 57 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