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

chrome/browser/extensions/extension_input_method_apitest.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/extensions/extension_apitest.h"
 
 #include "base/stringprintf.h"
 #include "chrome/browser/chromeos/extensions/input_method_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/extensions/extension_test_api.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kNewInputMethod[] = "ru::rus";
 const char kSetInputMethodMessage[] = "setInputMethod";
 const char kSetInputMethodDone[] = "done";
 
 // Class that listens for the JS message then changes input method and replies
 // back.
 class SetInputMethodListener : public content::NotificationObserver {
  public:
   // Creates listener, which should reply exactly |count_| times.
   explicit SetInputMethodListener(int count) : count_(count) {
     registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_TEST_MESSAGE,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
   }
 
   virtual ~SetInputMethodListener() {
     EXPECT_EQ(0, count_);
   }
 
   // Implements the content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
@@ skipping 19 matching lines @@
 };
 
 }  // namespace
 
 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, InputMethodApiBasic) {
   // Two test, two calls. See JS code for more info.
   SetInputMethodListener listener(2);
 
   ASSERT_TRUE(RunExtensionTest("input_method")) << message_;
 }