mac: Update clients of scoped_nsobject.h.

ui/app_list/cocoa/app_list_view_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.
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #import "testing/gtest_mac.h"
 #import "ui/app_list/cocoa/app_list_view_controller.h"
 #import "ui/app_list/cocoa/apps_grid_controller.h"
 #import "ui/app_list/cocoa/test/apps_grid_controller_test_helper.h"
 #include "ui/app_list/test/app_list_test_model.h"
 #include "ui/app_list/test/app_list_test_view_delegate.h"
 
 namespace app_list {
 namespace test {
 
@@ skipping 14 matching lines @@
     AppsGridControllerTestHelper::TearDown();
   }
 
   virtual void ResetModel(scoped_ptr<AppListModel> new_model) OVERRIDE {
     scoped_ptr<AppListViewDelegate> delegate_(new AppListTestViewDelegate);
     [app_list_view_controller_ setDelegate:delegate_.Pass()
                              withTestModel:new_model.Pass()];
   }
 
  protected:
-  scoped_nsobject<AppListViewController> app_list_view_controller_;
+  base::scoped_nsobject<AppListViewController> app_list_view_controller_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListViewControllerTest);
 };
 
 TEST_VIEW(AppListViewControllerTest, [app_list_view_controller_ view]);
 
 // Test that adding and removing pages updates the pager.
 TEST_F(AppListViewControllerTest, PagerSegmentCounts) {
   NSSegmentedControl* pager = [app_list_view_controller_ pagerControl];
@@ skipping 32 matching lines @@
   // Replace with a single page model, and ensure we go back to the first page.
   ReplaceTestModel(1);
   EXPECT_EQ(0u, [apps_grid_controller_ visiblePage]);
   EXPECT_EQ(0, [pager selectedSegment]);
   EXPECT_EQ(1, [pager segmentCount]);
   EXPECT_EQ(1.0, [apps_grid_controller_ visiblePortionOfPage:0]);
 }
 
 }  // namespace test
 }  // namespace app_list