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

chrome/browser/chromeos/login/google_authenticator.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/google_authenticator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/browser/chromeos/login/ownership_service.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/net/gaia/gaia_auth_fetcher.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_status.h"
 #include "third_party/libjingle/source/talk/base/urlencode.h"
 
 using base::Time;
 using base::TimeDelta;
 using file_util::GetFileSize;
 using file_util::PathExists;
 using file_util::ReadFile;
@@ skipping 123 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&GoogleAuthenticator::CheckOffline, this,
                  LoginFailure(LoginFailure::UNLOCK_FAILED)));
 }
 
 void GoogleAuthenticator::LoginOffTheRecord() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   int mount_error = chromeos::kCryptohomeMountErrorNone;
   if (CrosLibrary::Get()->GetCryptohomeLibrary()->MountForBwsi(&mount_error)) {
     AuthenticationNotificationDetails details(true);
-    NotificationService::current()->Notify(
+    content::NotificationService::current()->Notify(
         chrome::NOTIFICATION_LOGIN_AUTHENTICATION,
-        NotificationService::AllSources(),
+        content::NotificationService::AllSources(),
         content::Details<AuthenticationNotificationDetails>(&details));
     consumer_->OnOffTheRecordLoginSuccess();
   } else {
     LOG(ERROR) << "Could not mount tmpfs: " << mount_error;
     consumer_->OnLoginFailure(
         LoginFailure(LoginFailure::COULD_NOT_MOUNT_TMPFS));
   }
 }
 
 void GoogleAuthenticator::OnClientLoginSuccess(
@@ skipping 82 matching lines @@
       BrowserThread::UI, FROM_HERE,
       base::Bind(&GoogleAuthenticator::CheckLocalaccount, this,
                  failure_details));
 }
 
 void GoogleAuthenticator::OnLoginSuccess(
     const GaiaAuthConsumer::ClientLoginResult& credentials,
     bool request_pending) {
   // Send notification of success
   AuthenticationNotificationDetails details(true);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_AUTHENTICATION,
-      NotificationService::AllSources(),
+      content::NotificationService::AllSources(),
       content::Details<AuthenticationNotificationDetails>(&details));
 
   int mount_error = chromeos::kCryptohomeMountErrorNone;
   BootTimesLoader::Get()->AddLoginTimeMarker("CryptohomeMounting", false);
   if (unlock_ ||
       (CrosLibrary::Get()->GetCryptohomeLibrary()->Mount(username_.c_str(),
                                                          ascii_hash_.c_str(),
                                                          &mount_error))) {
     BootTimesLoader::Get()->AddLoginTimeMarker("CryptohomeMounted", true);
     consumer_->OnLoginSuccess(username_,
@@ skipping 52 matching lines @@
           LoginFailure(LoginFailure::COULD_NOT_MOUNT_TMPFS));
     }
   } else {
     OnLoginFailure(error);
   }
 }
 
 void GoogleAuthenticator::OnLoginFailure(const LoginFailure& error) {
   // Send notification of failure
   AuthenticationNotificationDetails details(false);
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_LOGIN_AUTHENTICATION,
-      NotificationService::AllSources(),
+      content::NotificationService::AllSources(),
       content::Details<AuthenticationNotificationDetails>(&details));
   LOG(WARNING) << "Login failed: " << error.GetErrorString();
   consumer_->OnLoginFailure(error);
 }
 
 void GoogleAuthenticator::RecoverEncryptedData(const std::string& old_password,
     const GaiaAuthConsumer::ClientLoginResult& credentials) {
 
   std::string old_hash = HashPassword(old_password);
   if (CrosLibrary::Get()->GetCryptohomeLibrary()->MigrateKey(username_,
@@ skipping 125 matching lines @@
                                       const unsigned int len) {
   if (len < 2*binary_len)
     return false;
   memset(hex_string, 0, len);
   for (uint i = 0, j = 0; i < binary_len; i++, j+=2)
     snprintf(hex_string + j, len - j, "%02x", binary[i]);
   return true;
 }
 
 }  // namespace chromeos