mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/profile_menu_controller_unittest.mm

 // Copyright (c) 2011 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 "chrome/browser/ui/cocoa/profile_menu_controller.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/profiles/avatar_menu_model.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest_mac.h"
@@ skipping 46 matching lines @@
           << " (from line " << line << ")";
       }
     }
   }
 
   ProfileMenuController* controller() { return controller_.get(); }
 
   NSMenuItem* menu_item() { return item_.get(); }
 
  private:
-  scoped_nsobject<NSMenuItem> item_;
-  scoped_nsobject<ProfileMenuController> controller_;
+  base::scoped_nsobject<NSMenuItem> item_;
+  base::scoped_nsobject<ProfileMenuController> controller_;
 };
 
 TEST_F(ProfileMenuControllerTest, InitializeMenu) {
   NSMenu* menu = [controller() menu];
   // <sep>, Edit, <sep>, New.
   ASSERT_EQ(4, [menu numberOfItems]);
 
   TestBottomItems();
 
   EXPECT_TRUE([menu_item() isHidden]);
@@ skipping 31 matching lines @@
 
   item = [menu itemAtIndex:2];
   EXPECT_EQ(@selector(switchToProfileFromMenu:), [item action]);
 
   TestBottomItems();
 
   EXPECT_FALSE([menu_item() isHidden]);
 }
 
 TEST_F(ProfileMenuControllerTest, InsertItems) {
-  scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle: @""]);
+  base::scoped_nsobject<NSMenu> menu([[NSMenu alloc] initWithTitle:@""]);
   ASSERT_EQ(0, [menu numberOfItems]);
 
   // With only one profile, insertItems should be a no-op.
   BOOL result = [controller() insertItemsIntoMenu:menu
                                          atOffset:0
                                          fromDock:NO];
   EXPECT_FALSE(result);
   EXPECT_EQ(0, [menu numberOfItems]);
   [menu removeAllItems];
 
@@ skipping 98 matching lines @@
   local_state->SetString(prefs::kProfileLastUsed,
                          profile3_path.BaseName().MaybeAsASCII());
 
   // Simulate the active browser changing to NULL and ensure a profile doesn't
   // get created by disallowing IO operations temporarily.
   const bool io_was_allowed = base::ThreadRestrictions::SetIOAllowed(false);
   [controller() activeBrowserChangedTo:NULL];
   base::ThreadRestrictions::SetIOAllowed(io_was_allowed);
 }