mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/browser/avatar_button_controller_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 "chrome/browser/ui/cocoa/browser/avatar_button_controller.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/browser/avatar_menu_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/common/pref_names.h"
 
 class AvatarButtonControllerTest : public CocoaProfileTest {
  public:
   virtual void SetUp() {
@@ skipping 10 matching lines @@
     CocoaProfileTest::TearDown();
   }
 
   NSButton* button() { return [controller_ buttonView]; }
 
   NSView* view() { return [controller_ view]; }
 
   AvatarButtonController* controller() { return controller_.get(); }
 
  private:
-  scoped_nsobject<AvatarButtonController> controller_;
+  base::scoped_nsobject<AvatarButtonController> controller_;
 };
 
 TEST_F(AvatarButtonControllerTest, AddRemoveProfiles) {
   EXPECT_TRUE([view() isHidden]);
 
   testing_profile_manager()->CreateTestingProfile("one");
 
   EXPECT_FALSE([view() isHidden]);
 
   testing_profile_manager()->CreateTestingProfile("two");
@@ skipping 33 matching lines @@
   // Create a second profile to enable the avatar menu.
   testing_profile_manager()->CreateTestingProfile("p2");
 
   EXPECT_FALSE([controller() labelButtonView]);
 
   // Transform the first profile to a managed user profile.
   profile()->GetPrefs()->SetBoolean(prefs::kProfileIsManaged, true);
 
   // Build a new controller to check if it is initialized correctly for a
   // managed user profile.
-  scoped_nsobject<AvatarButtonController> controller(
+  base::scoped_nsobject<AvatarButtonController> controller(
       [[AvatarButtonController alloc] initWithBrowser:browser()]);
 
   EXPECT_TRUE([controller labelButtonView]);
 }