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

chrome/browser/extensions/extension_menu_manager_unittest.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 <vector>
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_vector.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_menu_manager.h"
 #include "chrome/browser/extensions/test_extension_prefs.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/context_menu.h"
 
 using testing::_;
 using testing::AtLeast;
 using testing::Return;
 using testing::SaveArg;
 
 // Base class for tests.
@@ skipping 271 matching lines @@
   ASSERT_FALSE(manager_.ChangeParent(item4->id(), &item1->id()));
   ASSERT_FALSE(manager_.ChangeParent(item1->id(), &item4->id()));
 
   // Make sure you can't make an item be it's own parent.
   ASSERT_FALSE(manager_.ChangeParent(item1->id(), &item1->id()));
 }
 
 // Tests that we properly remove an extension's menu item when that extension is
 // unloaded.
 TEST_F(ExtensionMenuManagerTest, ExtensionUnloadRemovesMenuItems) {
-  NotificationService* notifier = NotificationService::current();
+  content::NotificationService* notifier =
+      content::NotificationService::current();
   ASSERT_TRUE(notifier != NULL);
 
   // Create a test extension.
   Extension* extension1 = AddExtension("1111");
 
   // Create an ExtensionMenuItem and put it into the manager.
   ExtensionMenuItem* item1 = CreateTestItem(extension1);
   ExtensionMenuItem::Id id1 = item1->id();
   ASSERT_EQ(extension1->id(), item1->extension_id());
   ASSERT_TRUE(manager_.AddContextItem(extension1, item1));
@@ skipping 158 matching lines @@
   ASSERT_EQ(params.page_url.spec(), tmp);
 
   string16 tmp16;
   ASSERT_TRUE(info->GetString("selectionText", &tmp16));
   ASSERT_EQ(params.selection_text, tmp16);
 
   bool bool_tmp = true;
   ASSERT_TRUE(info->GetBoolean("editable", &bool_tmp));
   ASSERT_EQ(params.is_editable, bool_tmp);
 }