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

chrome/browser/chromeos/boot_times_loader.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/chromeos/boot_times_loader.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 13 matching lines @@
 #include "chrome/browser/chromeos/login/authentication_notification_details.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace {
 
 RenderWidgetHost* GetRenderWidgetHost(NavigationController* tab) {
   TabContents* tab_contents = tab->tab_contents();
   if (tab_contents) {
     RenderWidgetHostView* render_widget_host_view =
         tab_contents->GetRenderWidgetHostView();
     if (render_widget_host_view)
       return render_widget_host_view->GetRenderWidgetHost();
@@ skipping 293 matching lines @@
   output += '\n';
 
   file_util::WriteFile(
       log_path.Append(base_name), output.data(), output.size());
 }
 
 void BootTimesLoader::LoginDone() {
   AddLoginTimeMarker("LoginDone", true);
   RecordCurrentStats(kChromeFirstRender);
   registrar_.Remove(this, content::NOTIFICATION_LOAD_START,
-                    NotificationService::AllSources());
+                    content::NotificationService::AllSources());
   registrar_.Remove(this, content::NOTIFICATION_LOAD_STOP,
-                    NotificationService::AllSources());
+                    content::NotificationService::AllSources());
   registrar_.Remove(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                    NotificationService::AllSources());
+                    content::NotificationService::AllSources());
   registrar_.Remove(this, content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT,
-                    NotificationService::AllSources());
+                    content::NotificationService::AllSources());
   // Don't swamp the FILE thread right away.
   BrowserThread::PostDelayedTask(
       BrowserThread::FILE, FROM_HERE,
       // This doesn't compile without std::string(...), as
       // NewRunnableFunction doesn't accept arrays.
       base::Bind(WriteTimes,
                  std::string(kLoginTimes),
                  std::string(kUmaLogin),
                  std::string(kUmaLoginPrefix),
                  login_time_markers_),
@@ skipping 34 matching lines @@
 void BootTimesLoader::RecordChromeMainStats() {
   RecordStats(kChromeMain, chrome_main_stats_);
 }
 
 void BootTimesLoader::RecordLoginAttempted() {
   login_time_markers_.clear();
   AddLoginTimeMarker("LoginStarted", false);
   if (!have_registered_) {
     have_registered_ = true;
     registrar_.Add(this, chrome::NOTIFICATION_LOGIN_AUTHENTICATION,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
     registrar_.Add(this, content::NOTIFICATION_LOAD_START,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
     registrar_.Add(this, content::NOTIFICATION_LOAD_STOP,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
     registrar_.Add(this, content::NOTIFICATION_TAB_CONTENTS_DESTROYED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
     registrar_.Add(this, content::NOTIFICATION_RENDER_WIDGET_HOST_DID_PAINT,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
   }
 }
 
 void BootTimesLoader::AddLoginTimeMarker(
     const std::string& marker_name, bool send_to_uma) {
   login_time_markers_.push_back(TimeMarker(marker_name, send_to_uma));
 }
 
 void BootTimesLoader::AddLogoutTimeMarker(
     const std::string& marker_name, bool send_to_uma) {
   logout_time_markers_.push_back(TimeMarker(marker_name, send_to_uma));
 }
 
 void BootTimesLoader::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_LOGIN_AUTHENTICATION: {
       content::Details<AuthenticationNotificationDetails> auth_details(details);
       if (auth_details->success()) {
         AddLoginTimeMarker("Authenticate", true);
         RecordCurrentStats(kLoginSuccess);
         registrar_.Remove(this, chrome::NOTIFICATION_LOGIN_AUTHENTICATION,
-                          NotificationService::AllSources());
+                          content::NotificationService::AllSources());
       }
       break;
     }
     case content::NOTIFICATION_LOAD_START: {
       NavigationController* tab =
           content::Source<NavigationController>(source).ptr();
       RenderWidgetHost* rwh = GetRenderWidgetHost(tab);
       DCHECK(rwh);
       AddLoginTimeMarker("TabLoad-Start: " + GetTabUrl(rwh), false);
       render_widget_hosts_loading_.insert(rwh);
@@ skipping 24 matching lines @@
           GetRenderWidgetHost(&tab_contents->controller());
       render_widget_hosts_loading_.erase(render_widget_host);
       break;
     }
     default:
       break;
   }
 }
 
 }  // namespace chromeos