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

chrome/browser/metrics/metrics_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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It
@@ skipping 161 matching lines @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/metrics_log_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/child_process_info.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 // TODO(port): port browser_distribution.h.
 #if !defined(OS_POSIX)
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 259 matching lines @@
 bool MetricsService::reporting_active() const {
   DCHECK(IsSingleThreaded());
   return reporting_active_;
 }
 
 // static
 void MetricsService::SetUpNotifications(
     content::NotificationRegistrar* registrar,
     content::NotificationObserver* observer) {
   registrar->Add(observer, chrome::NOTIFICATION_BROWSER_OPENED,
-                 NotificationService::AllBrowserContextsAndSources());
+                 content::NotificationService::AllBrowserContextsAndSources());
   registrar->Add(observer, chrome::NOTIFICATION_BROWSER_CLOSED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_USER_ACTION,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_TAB_PARENTED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_TAB_CLOSING,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_LOAD_START,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_LOAD_STOP,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_RENDERER_PROCESS_HANG,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_CHILD_PROCESS_HOST_CONNECTED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_CHILD_INSTANCE_CREATED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, content::NOTIFICATION_CHILD_PROCESS_CRASHED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   registrar->Add(observer, chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED,
-                 NotificationService::AllBrowserContextsAndSources());
+                 content::NotificationService::AllBrowserContextsAndSources());
 }
 
 void MetricsService::Observe(int type,
                              const content::NotificationSource& source,
                              const content::NotificationDetails& details) {
   DCHECK(log_manager_.current_log());
   DCHECK(IsSingleThreaded());
 
   if (!CanLogNotification(type, source, details))
     return;
@@ skipping 693 matching lines @@
   }
 
   // TODO(brettw) we should have some kind of ID for the parent.
   log_manager_.current_log()->RecordWindowEvent(window_type, controller_id, 0);
 }
 
 void MetricsService::LogLoadComplete(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  if (details == NotificationService::NoDetails())
+  if (details == content::NotificationService::NoDetails())
     return;
 
   // TODO(jar): There is a bug causing this to be called too many times, and
   // the log overflows.  For now, we won't record these events.
   UMA_HISTOGRAM_COUNTS("UMA.LogLoadComplete called", 1);
   return;
 
   const content::Details<LoadNotificationDetails> load_details(details);
   int controller_id = window_map_[details.map_key()];
   log_manager_.current_log()->RecordLoadEvent(controller_id,
@@ skipping 327 matching lines @@
   if (local_state) {
     const PrefService::Preference* uma_pref =
         local_state->FindPreference(prefs::kMetricsReportingEnabled);
     if (uma_pref) {
       bool success = uma_pref->GetValue()->GetAsBoolean(&result);
       DCHECK(success);
     }
   }
   return result;
 }