Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/web_resource/web_resource_service.cc

 // Copyright (c) 2011 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/web_resource/web_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/net/url_fetcher.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
 
 class WebResourceService::WebResourceFetcher
     : public URLFetcher::Delegate {
  public:
   explicit WebResourceFetcher(WebResourceService* web_resource_service) :
       ALLOW_THIS_IN_INITIALIZER_LIST(fetcher_factory_(this)),
       web_resource_service_(web_resource_service) {
@@ skipping 222 matching lines @@
 void WebResourceService::OnWebResourceUnpacked(
   const DictionaryValue& parsed_json) {
   Unpack(parsed_json);
   EndFetch();
 }
 
 void WebResourceService::WebResourceStateChange() {
   web_resource_update_scheduled_ = false;
   if (notification_type_ == chrome::NOTIFICATION_CHROME_END)
     return;
-  NotificationService* service = NotificationService::current();
+  content::NotificationService* service =
+      content::NotificationService::current();
   service->Notify(notification_type_,
                   content::Source<WebResourceService>(this),
-                  NotificationService::NoDetails());
+                  content::NotificationService::NoDetails());
 }
 
 void WebResourceService::StartAfterDelay() {
   int64 delay = start_fetch_delay_;
   // Check whether we have ever put a value in the web resource cache;
   // if so, pull it out and see if it's time to update again.
   if (prefs_->HasPrefPath(last_update_time_pref_name_)) {
     std::string last_update_pref =
         prefs_->GetString(last_update_time_pref_name_);
     if (!last_update_pref.empty()) {
@@ skipping 12 matching lines @@
 }
 
 void WebResourceService::UpdateResourceCache(const std::string& json_data) {
   UnpackerClient* client = new UnpackerClient(this, json_data);
   client->Start();
 
   // Set cache update time in preferences.
   prefs_->SetString(last_update_time_pref_name_,
       base::DoubleToString(base::Time::Now().ToDoubleT()));
 }