mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge_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.
 
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // TODO(jrg): use OCMock.
 
 namespace {
 
 // Information needed to open a URL, as passed to the
 // BookmarkBarController's delegate.
 typedef std::pair<GURL,WindowOpenDisposition> OpenInfo;
 
 }  // The namespace must end here -- I need to use OpenInfo in
    // FakeBookmarkBarController but can't place
    // FakeBookmarkBarController itself in the namespace ("error:
    // Objective-C declarations may only appear in global scope")
 
 // Oddly, we are our own delegate.
 @interface FakeBookmarkBarController : BookmarkBarController {
  @public
-  scoped_nsobject<NSMutableArray> callbacks_;
+  base::scoped_nsobject<NSMutableArray> callbacks_;
   std::vector<OpenInfo> opens_;
 }
 @end
 
 @implementation FakeBookmarkBarController
 
 - (id)initWithBrowser:(Browser*)browser {
   if ((self = [super initWithBrowser:browser
                         initialWidth:100  // arbitrary
                             delegate:nil
@@ skipping 51 matching lines @@
 @end
 
 
 class BookmarkBarBridgeTest : public CocoaProfileTest {
 };
 
 // Call all the callbacks; make sure they are all redirected to the objc object.
 TEST_F(BookmarkBarBridgeTest, TestRedirect) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
 
-  scoped_nsobject<NSView> parentView([[NSView alloc]
-                                       initWithFrame:NSMakeRect(0,0,100,100)]);
-  scoped_nsobject<NSView> webView([[NSView alloc]
-                                       initWithFrame:NSMakeRect(0,0,100,100)]);
-  scoped_nsobject<NSView> infoBarsView(
-      [[NSView alloc] initWithFrame:NSMakeRect(0,0,100,100)]);
+  base::scoped_nsobject<NSView> parentView(
+      [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
+  base::scoped_nsobject<NSView> webView(
+      [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
+  base::scoped_nsobject<NSView> infoBarsView(
+      [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
 
-  scoped_nsobject<FakeBookmarkBarController>
-      controller([[FakeBookmarkBarController alloc] initWithBrowser:browser()]);
+  base::scoped_nsobject<FakeBookmarkBarController> controller(
+      [[FakeBookmarkBarController alloc] initWithBrowser:browser()]);
   EXPECT_TRUE(controller.get());
   scoped_ptr<BookmarkBarBridge> bridge(new BookmarkBarBridge(profile(),
                                                              controller.get(),
                                                              model));
   EXPECT_TRUE(bridge.get());
 
   bridge->Loaded(NULL, false);
   bridge->BookmarkModelBeingDeleted(NULL);
   bridge->BookmarkNodeMoved(NULL, NULL, 0, NULL, 0);
   bridge->BookmarkNodeAdded(NULL, NULL, 0);
   bridge->BookmarkNodeChanged(NULL, NULL);
   bridge->BookmarkNodeFaviconChanged(NULL, NULL);
   bridge->BookmarkNodeChildrenReordered(NULL, NULL);
   bridge->BookmarkNodeRemoved(NULL, NULL, 0, NULL);
 
   // 8 calls above plus an initial Loaded() in init routine makes 9
   EXPECT_TRUE([controller.get()->callbacks_ count] == 9);
 
   for (int x = 1; x < 9; x++) {
     NSNumber* num = [NSNumber numberWithInt:x-1];
     EXPECT_NSEQ(num, [controller.get()->callbacks_ objectAtIndex:x]);
   }
 }