mac: Update clients of scoped_nsobject.h.

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

 // Copyright (c) 2012 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/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.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/public/browser/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
@@ skipping 226 matching lines @@
 
 // CallClose; bubble gets closed.
 // Also confirm pulse notifications get sent.
 TEST_F(BookmarkBubbleControllerTest, TestClose) {
     BookmarkModel* model = GetBookmarkModel();
     const BookmarkNode* node = model->AddURL(
         model->bookmark_bar_node(), 0, ASCIIToUTF16("Bookie markie title"),
         GURL("http://www.google.com"));
   EXPECT_EQ(edits_, 0);
 
-  scoped_nsobject<BookmarkPulseObserver> observer([[BookmarkPulseObserver alloc]
-                                                    init]);
+  base::scoped_nsobject<BookmarkPulseObserver> observer(
+      [[BookmarkPulseObserver alloc] init]);
   EXPECT_EQ([observer notifications], 0);
   BookmarkBubbleController* controller = ControllerForNode(node);
   EXPECT_TRUE(controller);
   EXPECT_FALSE(IsWindowClosing());
   EXPECT_EQ([observer notifications], 1);
   [controller ok:controller];
   EXPECT_EQ(edits_, 0);
   EXPECT_TRUE(IsWindowClosing());
   EXPECT_EQ([observer notifications], 2);
 }
@@ skipping 198 matching lines @@
 // 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