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

chrome/browser/ui/webui/chromeos/sim_unlock_ui.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/ui/webui/chromeos/sim_unlock_ui.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string_piece.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/sim_dialog_delegate.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 // JS API callbacks names.
 const char kJsApiCancel[] = "cancel";
 const char kJsApiChangePinCode[] = "changePinCode";
@@ skipping 418 matching lines @@
       }
       break;
     case CODE_PUK:
       DCHECK(!new_pin_.empty());
       lib->UnblockPin(code, new_pin_);
       break;
   }
 }
 
 void SimUnlockHandler::NotifyOnEnterPinEnded(bool cancelled) {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_ENTER_PIN_ENDED,
-      NotificationService::AllSources(),
+      content::NotificationService::AllSources(),
       content::Details<bool>(&cancelled));
 }
 
 void SimUnlockHandler::NotifyOnRequirePinChangeEnded(bool new_value) {
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_REQUIRE_PIN_SETTING_CHANGE_ENDED,
-      NotificationService::AllSources(),
+      content::NotificationService::AllSources(),
       content::Details<bool>(&new_value));
 }
 
 void SimUnlockHandler::HandleCancel(const ListValue* args) {
   const size_t kEnterCodeParamCount = 0;
   if (args->GetSize() != kEnterCodeParamCount) {
     NOTREACHED();
     return;
   }
   scoped_refptr<TaskProxy> task = new TaskProxy(AsWeakPtr());
@@ skipping 192 matching lines @@
   AddMessageHandler((handler)->Attach(this));
   handler->Init(contents);
   SimUnlockUIHTMLSource* html_source = new SimUnlockUIHTMLSource();
 
   // Set up the chrome://sim-unlock/ source.
   Profile* profile = Profile::FromBrowserContext(contents->browser_context());
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 }  // namespace chromeos