mac: Update clients of scoped_nsobject.h.

ui/app_list/cocoa/apps_search_box_controller_unittest.mm

 // Copyright 2013 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 "ui/app_list/cocoa/apps_search_box_controller.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "testing/gtest_mac.h"
 #include "ui/app_list/app_list_menu.h"
 #import "ui/app_list/cocoa/current_user_menu_item_view.h"
 #include "ui/app_list/search_box_model.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 #import "ui/base/test/ui_cocoa_test_helper.h"
 
@@ skipping 62 matching lines @@
   }
 
   void SimulateKeyAction(SEL c) {
     NSControl* control = [apps_search_box_controller_ searchTextField];
     [apps_search_box_controller_ control:control
                                 textView:nil
                      doCommandBySelector:c];
   }
 
  protected:
-  scoped_nsobject<TestAppsSearchBoxDelegate> delegate_;
-  scoped_nsobject<AppsSearchBoxController> apps_search_box_controller_;
+  base::scoped_nsobject<TestAppsSearchBoxDelegate> delegate_;
+  base::scoped_nsobject<AppsSearchBoxController> apps_search_box_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsSearchBoxControllerTest);
 };
 
 TEST_VIEW(AppsSearchBoxControllerTest, [apps_search_box_controller_ view]);
 
 // Test the search box initialization, and search input and clearing.
 TEST_F(AppsSearchBoxControllerTest, SearchBoxModel) {
   app_list::SearchBoxModel* model = [delegate_ searchBoxModel];
@@ skipping 67 matching lines @@
 
   virtual void SetUp() OVERRIDE {
     scoped_ptr<AppListViewDelegate> delegate(new AppListTestViewDelegate);
     current_user_menu_item_.reset([[[CurrentUserMenuItemView alloc]
         initWithDelegate:delegate.get()] retain]);
     ui::CocoaTest::SetUp();
     [[test_window() contentView] addSubview:current_user_menu_item_];
   }
 
  protected:
-  scoped_nsobject<NSView> current_user_menu_item_;
+  base::scoped_nsobject<NSView> current_user_menu_item_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppsSearchBoxCustomMenuItemTest);
 };
 
 TEST_VIEW(AppsSearchBoxCustomMenuItemTest, current_user_menu_item_);
 
 }  // namespace test
 }  // namespace app_list