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

chrome/browser/rlz/rlz.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.
 //
 // This code glues the RLZ library DLL with Chrome. It allows Chrome to work
 // with or without the DLL being present. If the DLL is not present the
 // functions do nothing and just return false.
 
 #include "chrome/browser/rlz/rlz.h"
 
@@ skipping 15 matching lines @@
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/navigation_entry.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace {
 
 void RecordProductEvents(bool first_run, bool google_default_search,
                          bool google_default_homepage, bool already_ran,
                          bool omnibox_used, bool homepage_used) {
   // Record the installation of chrome. We call this all the time but the rlz
   // lib should ingore all but the first one.
   rlz_lib::RecordProductEvent(rlz_lib::CHROME,
                               rlz_lib::CHROME_OMNIBOX,
@@ skipping 125 matching lines @@
   const int kMaxDelay = 200 * 1000;
   const int kMinDelay = 20 * 1000;
 
   delay *= 1000;
   delay = (delay < kMinDelay) ? kMinDelay : delay;
   delay = (delay > kMaxDelay) ? kMaxDelay : delay;
 
   // Register for notifications from the omnibox so that we can record when
   // the user performs a first search.
   registrar_.Add(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
   // If instant is enabled we'll start searching as soon as the user starts
   // typing in the omnibox (which triggers INSTANT_CONTROLLER_UPDATED).
   registrar_.Add(this, chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 
   // Register for notifications from navigations, to see if the user has used
   // the home page.
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 
   ScheduleDelayedInit(delay);
 
   return true;
 }
 
 void RLZTracker::ScheduleDelayedInit(int delay) {
   BrowserThread::PostDelayedTask(
       BrowserThread::FILE,
       FROM_HERE,
@@ skipping 82 matching lines @@
   bool call_record = false;
 
   switch (type) {
     case chrome::NOTIFICATION_OMNIBOX_OPENED_URL:
     case chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED:
       point = rlz_lib::CHROME_OMNIBOX;
       record_used = &omnibox_used_;
       call_record = true;
 
       registrar_.Remove(this, chrome::NOTIFICATION_OMNIBOX_OPENED_URL,
-                        NotificationService::AllSources());
+                        content::NotificationService::AllSources());
       registrar_.Remove(this, chrome::NOTIFICATION_INSTANT_CONTROLLER_UPDATED,
-                        NotificationService::AllSources());
+                        content::NotificationService::AllSources());
       break;
     case content::NOTIFICATION_NAV_ENTRY_PENDING: {
       const NavigationEntry* entry =
           content::Details<NavigationEntry>(details).ptr();
       if (entry != NULL &&
           ((entry->transition_type() &
             content::PAGE_TRANSITION_HOME_PAGE) != 0)) {
         point = rlz_lib::CHROME_HOME_PAGE;
         record_used = &homepage_used_;
         call_record = true;
 
         registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
-                          NotificationService::AllSources());
+                          content::NotificationService::AllSources());
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 
   if (call_record) {
     // Try to record event now, else set the flag to try later when we
@@ skipping 71 matching lines @@
       BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(&RLZTracker::GetAccessPointRlz, point, not_used));
   return true;
 }
 
 // static
 void RLZTracker::CleanupRlz() {
   GetInstance()->rlz_cache_.clear();
   GetInstance()->registrar_.RemoveAll();
 }