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

chrome/browser/upgrade_detector.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/upgrade_detector.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/theme_resources.h"
 
 // How long to wait between checks for whether the user has been idle.
 static const int kIdleRepeatingTimerWait = 10;  // Minutes (seconds if testing).
 
 // How much idle time (since last input even was detected) must have passed
 // until we notify that a critical update has occurred.
 static const int kIdleAmount = 2;  // Hours (or seconds, if testing).
 
 bool UseTestingIntervals() {
@@ skipping 44 matching lines @@
 }
 
 void UpgradeDetector::NotifyUpgradeDetected() {
   upgrade_detected_time_ = base::Time::Now();
   critical_update_acknowledged_ = false;
 }
 
 void UpgradeDetector::NotifyUpgradeRecommended() {
   notify_upgrade_ = true;
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
       content::Source<UpgradeDetector>(this),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 
   if (is_critical_upgrade_) {
     int idle_timer = UseTestingIntervals() ?
         kIdleRepeatingTimerWait :
         kIdleRepeatingTimerWait * 60;  // To minutes.
     idle_check_timer_.Start(FROM_HERE,
         base::TimeDelta::FromSeconds(idle_timer),
         this, &UpgradeDetector::CheckIdle);
   }
 }
@@ skipping 11 matching lines @@
 void UpgradeDetector::IdleCallback(IdleState state) {
   switch (state) {
     case IDLE_STATE_LOCKED:
       // Computer is locked, auto-restart.
       idle_check_timer_.Stop();
       BrowserList::AttemptRestart();
       break;
     case IDLE_STATE_IDLE:
       // Computer has been idle for long enough, show warning.
       idle_check_timer_.Stop();
-      NotificationService::current()->Notify(
+      content::NotificationService::current()->Notify(
           chrome::NOTIFICATION_CRITICAL_UPGRADE_INSTALLED,
           content::Source<UpgradeDetector>(this),
-          NotificationService::NoDetails());
+          content::NotificationService::NoDetails());
       break;
     case IDLE_STATE_ACTIVE:
     case IDLE_STATE_UNKNOWN:
       break;
     default:
       NOTREACHED();  // Need to add any new value above (either providing
                      // automatic restart or show notification to user).
       break;
   }
 }