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

chrome/browser/chromeos/login/owner_manager.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/login/owner_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/boot_times_loader.h"
 #include "chrome/browser/chromeos/login/signed_settings_temp_storage.h"
 #include "content/browser/browser_thread.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace chromeos {
 
 OwnerManager::OwnerManager()
     : private_key_(NULL),
       public_key_(0),
       utils_(OwnerKeyUtils::Create()) {
 }
 
 OwnerManager::~OwnerManager() {}
@@ skipping 20 matching lines @@
   if (public_key_.empty() &&
       !utils_->ImportPublicKey(utils_->GetOwnerKeyFilePath(), &public_key_)) {
     result = chrome::NOTIFICATION_OWNER_KEY_FETCH_ATTEMPT_FAILED;
   }
 
   // Whether we loaded the public key or not, send a notification indicating
   // that we're done with this attempt.
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&OwnerManager::SendNotification, this, result,
-                 NotificationService::NoDetails()));
+                 content::NotificationService::NoDetails()));
 }
 
 bool OwnerManager::EnsurePublicKey() {
   if (public_key_.empty())
     LoadOwnerKey();
 
   return !public_key_.empty();
 }
 
 bool OwnerManager::EnsurePrivateKey() {
@@ skipping 59 matching lines @@
   BrowserThread::PostTask(
       thread_id, FROM_HERE,
       base::Bind(&OwnerManager::CallDelegate, this, d, return_code,
                  std::vector<uint8>()));
   BootTimesLoader::Get()->AddLoginTimeMarker("VerifyEnd", false);
 }
 
 void OwnerManager::SendNotification(
     int type,
     const content::NotificationDetails& details) {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       type,
-      NotificationService::AllSources(),
+      content::NotificationService::AllSources(),
       details);
 }
 
 }  // namespace chromeos