mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_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/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "grit/theme_resources.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 69 matching lines @@
 - (BOOL)isAnimatingBetweenState:(BookmarkBar::State)fromState
                        andState:(BookmarkBar::State)toState { return NO; }
 - (CGFloat)detachedMorphProgress { return 1; }
 @end
 
 class BookmarkBarToolbarViewTest : public CocoaTest {
  public:
   BookmarkBarToolbarViewTest() {
     controller_.reset([[DrawDetachedBarFakeController alloc] init]);
     NSRect frame = NSMakeRect(0, 0, 400, 40);
-    scoped_nsobject<BookmarkBarToolbarView> view(
+    base::scoped_nsobject<BookmarkBarToolbarView> view(
         [[BookmarkBarToolbarView alloc] initWithFrame:frame]);
     view_ = view.get();
     [[test_window() contentView] addSubview:view_];
     [view_ setController:controller_.get()];
   }
 
-  scoped_nsobject<DrawDetachedBarFakeController> controller_;
+  base::scoped_nsobject<DrawDetachedBarFakeController> controller_;
   BookmarkBarToolbarView* view_;
 };
 
 TEST_VIEW(BookmarkBarToolbarViewTest, view_)
 
 // Test drawing, mostly to ensure nothing leaks or crashes.
 TEST_F(BookmarkBarToolbarViewTest, DisplayAsNormalBar) {
   [controller_.get() setState:BookmarkBar::SHOW];
   [view_ display];
 }
 
 // Actions used in DisplayAsDetachedBarWithBgImage.
 ACTION(SetBackgroundTiling) {
   *arg1 = ThemeProperties::NO_REPEAT;
   return true;
 }
 
 ACTION(SetAlignLeft) {
   *arg1 = ThemeProperties::ALIGN_LEFT;
   return true;
 }
 
 // TODO(viettrungluu): write more unit tests, especially after my refactoring.