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

chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // Watch for bookmark pulse notifications so we can confirm they were sent.
 @interface BookmarkPulseObserver : NSObject {
   int notifications_;
 }
 @property (assign, nonatomic) int notifications;
 @end
@@ skipping 440 matching lines @@
   BookmarkBubbleController* controller = ControllerForNode(node);
   EXPECT_TRUE(controller);
   EXPECT_FALSE(IsWindowClosing());
 
   // We can't actually create a new tab here, e.g.
   //   browser()->AddTabWithURL(...);
   // Many of our browser objects (Browser, Profile, RequestContext)
   // are "just enough" to run tests without being complete.  Instead
   // we fake the notification that would be triggered by a tab
   // creation. See TabContents::NotifyConnected().
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       content::NOTIFICATION_TAB_CONTENTS_CONNECTED,
       content::Source<TabContents>(NULL),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
 
   // Confirm bubble going bye-bye.
   EXPECT_TRUE(IsWindowClosing());
 }
 
 
 }  // namespace
 
 @implementation NSApplication (BookmarkBubbleUnitTest)
 // Add handler for the editBookmarkNode: action to NSApp for testing purposes.
 // Normally this would be sent up the responder tree correctly, but since
 // tests run in the background, key window and main window are never set on
 // NSApplication. Adding it to NSApplication directly removes the need for
 // worrying about what the current window with focus is.
 - (void)editBookmarkNode:(id)sender {
   EXPECT_TRUE([sender respondsToSelector:@selector(node)]);
   BookmarkBubbleControllerTest::edits_++;
 }
 
 @end