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

chrome/browser/ui/views/accessibility_event_router_views_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 <string>
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_accessibility_api.h"
 #include "chrome/browser/ui/views/accessibility_event_router_views.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/testing_profile.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"
 #include "views/controls/button/text_button.h"
 #include "views/layout/grid_layout.h"
 #include "views/views_delegate.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
 
 #if defined(TOOLKIT_VIEWS)
@@ skipping 127 matching lines @@
   // Put the view in a window.
   views::Widget* window = CreateWindowWithContents(contents);
 
   // Set focus to the first button initially.
   button1->RequestFocus();
 
   // Start listening to ACCESSIBILITY_CONTROL_FOCUSED notifications.
   content::NotificationRegistrar registrar;
   registrar.Add(this,
                 chrome::NOTIFICATION_ACCESSIBILITY_CONTROL_FOCUSED,
-                NotificationService::AllSources());
+                content::NotificationService::AllSources());
 
   // Switch on accessibility event notifications.
   ExtensionAccessibilityEventRouter* accessibility_event_router =
       ExtensionAccessibilityEventRouter::GetInstance();
   accessibility_event_router->SetAccessibilityEnabled(true);
 
   // Create a profile and associate it with this window.
   TestingProfile profile;
   window->SetNativeWindowProperty(Profile::kProfileKey, &profile);
 
@@ skipping 13 matching lines @@
   EXPECT_EQ(2, focus_event_count_);
   EXPECT_EQ(kButton3NewASCII, last_control_name_);
 
   // Advance to button 1 and check the notification.
   focus_manager->AdvanceFocus(false);
   EXPECT_EQ(3, focus_event_count_);
   EXPECT_EQ(kButton1ASCII, last_control_name_);
 }
 
 #endif  // defined(TOOLKIT_VIEWS)