mac: Update clients of scoped_nsobject.h.

ui/app_list/cocoa/apps_grid_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/mac/foundation_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "testing/gtest_mac.h"
 #include "ui/app_list/app_list_constants.h"
 #include "ui/app_list/app_list_item_model.h"
 #import "ui/app_list/cocoa/apps_collection_view_drag_manager.h"
 #import "ui/app_list/cocoa/apps_grid_controller.h"
 #import "ui/app_list/cocoa/apps_grid_view_item.h"
 #import "ui/app_list/cocoa/apps_pagination_model_observer.h"
 #import "ui/app_list/cocoa/test/apps_grid_controller_test_helper.h"
@@ skipping 90 matching lines @@
     [test_window() makePretendKeyWindowAndSetFirstResponder:
         [apps_grid_controller_ collectionViewAtPageIndex:0]];
   }
 
   virtual void TearDown() OVERRIDE {
     owned_apps_grid_controller_.reset();
     AppsGridControllerTestHelper::TearDown();
   }
 
  private:
-  scoped_nsobject<AppsGridController> owned_apps_grid_controller_;
+  base::scoped_nsobject<AppsGridController> owned_apps_grid_controller_;
   scoped_ptr<AppListTestViewDelegate> owned_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(AppsGridControllerTest);
 };
 
 class AppListItemWithMenu : public AppListItemModel {
  public:
   AppListItemWithMenu(const std::string& title) : menu_model_(NULL) {
     SetTitle(title);
     menu_model_.AddItem(0, UTF8ToUTF16("Menu For: " + title));
@@ skipping 367 matching lines @@
   SimulateMouseEnterItemAt(1);
   EXPECT_EQ(GetItemViewAt(1), GetSelectedView());
   SimulateMouseExitItemAt(0);
   EXPECT_EQ(GetItemViewAt(1), GetSelectedView());
   SimulateMouseExitItemAt(1);
   EXPECT_EQ(nil, GetSelectedView());
 }
 
 // Test AppsGridPaginationObserver totalPagesChanged().
 TEST_F(AppsGridControllerTest, PaginationObserverPagesChanged) {
-  scoped_nsobject<TestPaginationObserver> observer(
+  base::scoped_nsobject<TestPaginationObserver> observer(
       [[TestPaginationObserver alloc] init]);
   [apps_grid_controller_ setPaginationObserver:observer];
 
   // Test totalPagesChanged.
   model()->PopulateApps(kItemsPerPage);
   EXPECT_EQ(0, [observer totalPagesChangedCount]);
   EXPECT_EQ(1u, [apps_grid_controller_ pageCount]);
   model()->PopulateApps(1);
   EXPECT_EQ(1, [observer totalPagesChangedCount]);
   EXPECT_EQ(2u, [apps_grid_controller_ pageCount]);
   ReplaceTestModel(0);
   EXPECT_EQ(2, [observer totalPagesChangedCount]);
   EXPECT_EQ(1u, [apps_grid_controller_ pageCount]);
   ReplaceTestModel(kItemsPerPage * 3 + 1);
   EXPECT_EQ(3, [observer totalPagesChangedCount]);
   EXPECT_EQ(4u, [apps_grid_controller_ pageCount]);
 
   EXPECT_FALSE([observer readVisibilityDidChange]);
   EXPECT_EQ(0, [observer selectedPageChangedCount]);
 
   [apps_grid_controller_ setPaginationObserver:nil];
 }
 
 // Test AppsGridPaginationObserver selectedPageChanged().
 TEST_F(AppsGridControllerTest, PaginationObserverSelectedPageChanged) {
-  scoped_nsobject<TestPaginationObserver> observer(
+  base::scoped_nsobject<TestPaginationObserver> observer(
       [[TestPaginationObserver alloc] init]);
   [apps_grid_controller_ setPaginationObserver:observer];
   EXPECT_EQ(0, [[NSAnimationContext currentContext] duration]);
 
   ReplaceTestModel(kItemsPerPage * 3 + 1);
   EXPECT_EQ(1, [observer totalPagesChangedCount]);
   EXPECT_EQ(4u, [apps_grid_controller_ pageCount]);
 
   EXPECT_FALSE([observer readVisibilityDidChange]);
   EXPECT_EQ(0, [observer selectedPageChangedCount]);
@@ skipping 200 matching lines @@
   // Scroll to end again, and keep dragging (should be ignored).
   [apps_grid_controller_ scrollToPage:2];
   [drag_manager onMouseDragged:mouse_at_cell_0];
   EXPECT_EQ(0u, GetPageIndexForItem(1));
   [drag_manager onMouseUp:mouse_at_cell_0];
   EXPECT_EQ(0u, GetPageIndexForItem(1));
 }
 
 // Test scrolling when dragging past edge or over the pager.
 TEST_F(AppsGridControllerTest, ScrollingWhileDragging) {
-  scoped_nsobject<TestPaginationObserver> observer(
+  base::scoped_nsobject<TestPaginationObserver> observer(
       [[TestPaginationObserver alloc] init]);
   [apps_grid_controller_ setPaginationObserver:observer];
 
   ReplaceTestModel(kItemsPerPage * 3);
   // Start on the middle page.
   [apps_grid_controller_ scrollToPage:1];
   NSCollectionView* page = [apps_grid_controller_ collectionViewAtPageIndex:1];
   NSEvent* mouse_at_cell_0 = MouseEventInCell(page, 0);
 
   NSEvent* at_center = MouseEventForScroll([apps_grid_controller_ view], 0.0);
@@ skipping 69 matching lines @@
   EXPECT_EQ(1, [menu numberOfItems]);
   EXPECT_NSEQ(@"Menu For: Item One", [[menu itemAtIndex:0] title]);
 
   menu = [page menuForEvent:mouse_at_cell_1];
   EXPECT_EQ(1, [menu numberOfItems]);
   EXPECT_NSEQ(@"Menu For: Item Two", [[menu itemAtIndex:0] title]);
 }
 
 }  // namespace test
 }  // namespace app_list