mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_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/content_settings/content_setting_bubble_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/common/media_stream_request.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
@@ skipping 20 matching lines @@
   }
 };
 
 class ContentSettingBubbleControllerTest
     : public ChromeRenderViewHostTestHarness {
  protected:
   // Helper function to create the bubble controller.
   ContentSettingBubbleController* CreateBubbleController(
       ContentSettingsType settingsType);
 
-  scoped_nsobject<NSWindow> parent_;
+  base::scoped_nsobject<NSWindow> parent_;
 
  private:
   base::mac::ScopedNSAutoreleasePool pool_;
 };
 
 ContentSettingBubbleController*
 ContentSettingBubbleControllerTest::CreateBubbleController(
     ContentSettingsType settingsType) {
   parent_.reset([[NSWindow alloc] initWithContentRect:NSMakeRect(0, 0, 800, 600)
                                             styleMask:NSBorderlessWindowMask
@@ skipping 55 matching lines @@
                 (content::MEDIA_DEVICE_VIDEO_CAPTURE == i->second->type));
     EXPECT_EQ(0, [i->first numberOfItems]);
     EXPECT_NSEQ(title, [i->first title]);
     EXPECT_FALSE([i->first isEnabled]);
   }
 
  [parent_ close];
 }
 
 }  // namespace