mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/browser_window_cocoa_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.
 
 #include "base/mac/mac_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
 #import "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/notification_details.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "third_party/ocmock/OCMock/OCMock.h"
 #import "third_party/ocmock/gtest_support.h"
-#import "third_party/ocmock/OCMock/OCMock.h"
 
 // Main test class.
 class BrowserWindowCocoaTest : public CocoaProfileTest {
   virtual void SetUp() {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
     controller_ = [[BrowserWindowController alloc] initWithBrowser:browser()
                                                      takeOwnership:NO];
   }
@@ skipping 43 matching lines @@
 }
 - (BOOL)inPresentationMode {
   return windowState_ == kPresentation;
 }
 @end
 
 TEST_F(BrowserWindowCocoaTest, TestFullscreen) {
   // Wrap the FakeController in a scoped_nsobject instead of autoreleasing in
   // windowWillClose: because we never actually open a window in this test (so
   // windowWillClose: never gets called).
-  scoped_nsobject<FakeController> fake_controller(
+  base::scoped_nsobject<FakeController> fake_controller(
       [[FakeController alloc] init]);
   scoped_ptr<BrowserWindowCocoa> bwc(new BrowserWindowCocoa(
       browser(), static_cast<BrowserWindowController*>(fake_controller.get())));
 
   EXPECT_FALSE(bwc->IsFullscreen());
   bwc->EnterFullscreen(GURL(), FEB_TYPE_BROWSER_FULLSCREEN_EXIT_INSTRUCTION);
   EXPECT_FALSE(bwc->IsFullscreenWithChrome());
   EXPECT_TRUE(bwc->IsFullscreenWithoutChrome());
   bwc->ExitFullscreen();
   EXPECT_FALSE(bwc->IsFullscreen());
   [fake_controller close];
 }
 
 TEST_F(BrowserWindowCocoaTest, TestFullscreenWithChrome) {
   if (!base::mac::IsOSLionOrLater())
     return;
   // Wrap the FakeController in a scoped_nsobject instead of autoreleasing in
   // windowWillClose: because we never actually open a window in this test (so
   // windowWillClose: never gets called).
-  scoped_nsobject<FakeController> fake_controller(
+  base::scoped_nsobject<FakeController> fake_controller(
       [[FakeController alloc] init]);
   scoped_ptr<BrowserWindowCocoa> bwc(new BrowserWindowCocoa(
       browser(), static_cast<BrowserWindowController*>(fake_controller.get())));
 
   EXPECT_FALSE(bwc->IsFullscreen());
   bwc->EnterFullscreenWithChrome();
   EXPECT_TRUE(bwc->IsFullscreenWithChrome());
   EXPECT_FALSE(bwc->IsFullscreenWithoutChrome());
   bwc->ExitFullscreen();
   EXPECT_FALSE(bwc->IsFullscreen());
@@ skipping 114 matching lines @@
   [[[window_ stub] andReturn:nil] delegate];
   [[[controller_ stub] andReturn:window_] window];
   [[window_ expect] orderOut:nil];
   [[window_ expect] close];
   CreateAndCloseBrowserWindow();
   EXPECT_OCMOCK_VERIFY(controller_);
   EXPECT_OCMOCK_VERIFY(window_);
 }
 
 // TODO(???): test other methods of BrowserWindowCocoa