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

chrome/browser/web_resource/promo_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/promo_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/rand_util.h"
 #include "base/string_number_conversions.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/extensions/apps_promo.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.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_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
 // Delay on first fetch so we don't interfere with startup.
 static const int kStartResourceFetchDelay = 5000;
 
 // Delay between calls to update the cache (48 hours), and 3 min in debug mode.
 static const int kCacheUpdateDelay = 48 * 60 * 60 * 1000;
 static const int kTestCacheUpdateDelay = 3 * 60 * 1000;
@@ skipping 326 matching lines @@
   }
 
   // If logo start or end times have changed, trigger a new web resource
   // notification, so that the logo on the NTP is updated. This check is
   // outside the reading of the web resource data, because the absence of
   // dates counts as a triggering change if there were dates before.
   if (!(old_logo_start == logo_start) ||
       !(old_logo_end == logo_end)) {
     prefs_->SetDouble(prefs::kNTPCustomLogoStart, logo_start);
     prefs_->SetDouble(prefs::kNTPCustomLogoEnd, logo_end);
-    NotificationService* service = NotificationService::current();
+    content::NotificationService* service =
+        content::NotificationService::current();
     service->Notify(chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
                     content::Source<WebResourceService>(this),
-                    NotificationService::NoDetails());
+                    content::NotificationService::NoDetails());
   }
 }
 
 void PromoResourceService::UnpackSyncPromoSignal(
     const DictionaryValue& parsed_json) {
 #if defined(OS_CHROMEOS)
   // Don't bother with this signal on ChromeOS. Users are already synced.
   return;
 #endif
 
@@ skipping 27 matching lines @@
       !base::StringToInt(question.substr(build_index + 1), &new_group_max)) {
     // If anything about the response was invalid or this build is no longer
     // targeted and there are existing prefs, clear them and notify.
     if (prefs_->HasPrefPath(prefs::kNTPSyncPromoGroup) ||
         prefs_->HasPrefPath(prefs::kNTPSyncPromoGroupMax)) {
       // Make sure we clear first, as the following notification may possibly
       // depend on calling CanShowSyncPromo synchronously.
       prefs_->ClearPref(prefs::kNTPSyncPromoGroup);
       prefs_->ClearPref(prefs::kNTPSyncPromoGroupMax);
       // Notify the NTP resource cache if the promo has been disabled.
-      NotificationService::current()->Notify(
+      content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_PROMO_RESOURCE_STATE_CHANGED,
           content::Source<WebResourceService>(this),
-          NotificationService::NoDetails());
+          content::NotificationService::NoDetails());
     }
     return;
   }
 
   // TODO(dbeam): Add automagic hour group bumper to parsing?
 
   // If we successfully parsed a response and it differs from our user prefs,
   // set pref for next time to compare.
   if (new_group_max != prefs_->GetInteger(prefs::kNTPSyncPromoGroupMax))
     prefs_->SetInteger(prefs::kNTPSyncPromoGroupMax, new_group_max);
@@ skipping 11 matching lines @@
   if (!prefs->HasPrefPath(prefs::kNTPSyncPromoGroup)) {
     prefs->SetInteger(prefs::kNTPSyncPromoGroup,
                       base::RandInt(1, kSyncPromoNumberOfGroups));
   }
 
   // A response is not kept if the build wasn't targeted, so the only thing
   // required to check is the group this client has been tagged in.
   return prefs->GetInteger(prefs::kNTPSyncPromoGroupMax) >=
          prefs->GetInteger(prefs::kNTPSyncPromoGroup);
 }