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

chrome/browser/sync/util/extensions_activity_monitor.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/sync/util/extensions_activity_monitor.h"
 
 #include "base/task.h"
 #include "chrome/browser/extensions/extension_bookmarks_module.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace browser_sync {
 
 namespace {
 // A helper task to register an ExtensionsActivityMonitor as an observer of
 // events on the UI thread (even though the monitor may live on another thread).
 // This liberates ExtensionsActivityMonitor from having to be ref counted.
 class RegistrationTask : public Task {
  public:
   RegistrationTask(ExtensionsActivityMonitor* monitor,
                    content::NotificationRegistrar* registrar)
       : monitor_(monitor), registrar_(registrar) {}
   virtual ~RegistrationTask() {}
 
   virtual void Run() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
     // It would be nice if we could specify a Source for each specific function
     // we wanted to observe, but the actual function objects are allocated on
     // the fly so there is no reliable object to point to (same problem if we
     // wanted to use the string name).  Thus, we use all sources and filter in
     // Observe.
     registrar_->Add(monitor_,
                     chrome::NOTIFICATION_EXTENSION_BOOKMARKS_API_INVOKED,
-                    NotificationService::AllSources());
+                    content::NotificationService::AllSources());
   }
 
  private:
   ExtensionsActivityMonitor* monitor_;
   content::NotificationRegistrar* registrar_;
   DISALLOW_COPY_AND_ASSIGN(RegistrationTask);
 };
 }  // namespace
 
 ExtensionsActivityMonitor::ExtensionsActivityMonitor() {
@@ skipping 46 matching lines @@
       f->name() == "bookmarks.create" ||
       f->name() == "bookmarks.removeTree" ||
       f->name() == "bookmarks.remove") {
     Record& record = records_[extension->id()];
     record.extension_id = extension->id();
     record.bookmark_write_count++;
   }
 }
 
 }  // namespace browser_sync