mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/toolbar/toolbar_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>
 
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/browser_command_controller.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
 #include "chrome/common/pref_names.h"
@@ skipping 64 matching lines @@
     EXPECT_EQ(updater->IsCommandEnabled(IDC_BACK),
               [[views objectAtIndex:kBackIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_FORWARD),
               [[views objectAtIndex:kForwardIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_RELOAD),
               [[views objectAtIndex:kReloadIndex] isEnabled] ? true : false);
     EXPECT_EQ(updater->IsCommandEnabled(IDC_HOME),
               [[views objectAtIndex:kHomeIndex] isEnabled] ? true : false);
   }
 
-  scoped_nsobject<ViewResizerPong> resizeDelegate_;
-  scoped_nsobject<ToolbarController> bar_;
+  base::scoped_nsobject<ViewResizerPong> resizeDelegate_;
+  base::scoped_nsobject<ToolbarController> bar_;
 };
 
 TEST_VIEW(ToolbarControllerTest, [bar_ view])
 
 // Test the initial state that everything is sync'd up
 TEST_F(ToolbarControllerTest, InitialState) {
   CommandUpdater* updater = browser()->command_controller()->command_updater();
   CompareState(updater, [bar_ toolbarViews]);
 }
 
@@ skipping 104 matching lines @@
 TEST_F(ToolbarControllerTest, BookmarkBubblePoint) {
   const NSPoint starPoint = [bar_ bookmarkBubblePoint];
   const NSRect barFrame =
       [[bar_ view] convertRect:[[bar_ view] bounds] toView:nil];
 
   // Make sure the star is completely inside the location bar.
   EXPECT_TRUE(NSPointInRect(starPoint, barFrame));
 }
 
 TEST_F(ToolbarControllerTest, HoverButtonForEvent) {
-  scoped_nsobject<HitView> view([[HitView alloc]
-                                  initWithFrame:NSMakeRect(0,0,100,100)]);
+  base::scoped_nsobject<HitView> view(
+      [[HitView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100)]);
   [bar_ setView:view];
   NSEvent* event = [NSEvent mouseEventWithType:NSMouseMoved
                                       location:NSMakePoint(10,10)
                                  modifierFlags:0
                                      timestamp:0
                                   windowNumber:0
                                        context:nil
                                    eventNumber:0
                                     clickCount:0
                                       pressure:0.0];
 
   // NOT a match.
   [view setHitTestReturn:bar_.get()];
   EXPECT_FALSE([bar_ hoverButtonForEvent:event]);
 
   // Not yet...
-  scoped_nsobject<NSButton> button([[NSButton alloc] init]);
+  base::scoped_nsobject<NSButton> button([[NSButton alloc] init]);
   [view setHitTestReturn:button];
   EXPECT_FALSE([bar_ hoverButtonForEvent:event]);
 
   // Now!
-  scoped_nsobject<GradientButtonCell> cell([[GradientButtonCell alloc] init]);
+  base::scoped_nsobject<GradientButtonCell> cell(
+      [[GradientButtonCell alloc] init]);
   [button setCell:cell.get()];
   EXPECT_TRUE([bar_ hoverButtonForEvent:nil]);
 }
 
 }  // namespace