mac: Update clients of scoped_nsobject.h.

1.) The header is now in base/mac instead of base/memory
2.) The class is now in namespace base.

This CL was created programmatically by running:

1.)
    git grep -l memory/scoped_nsobject.h | xargs sed -i -e 's/memory\/scoped_nsobject.h/mac\/scoped_nsobject.h/g'
    for f in $(git diff --name-only origin); do tools/sort-headers.py $f -f; done
    git commit -a -m headers
    # manually undo changes to gypi file
    git cl upload # patch set 1
2.)
    git grep -l 'scoped_nsobject<' | xargs sed -i -e 's/scoped_nsobject</base::scoped_nsobject</g'
    # manually undo comment changes in scoped_nsobject.h, tracking_area.h
    git commit -a -m format
    git cl upload # patch set 2
    # Manually audit all files, file bugs and clean up bad clang-format decisions
    git cl upload # patch set 3
BUG=251957
TBR=mark@chromium.org

Review URL: https://codereview.chromium.org/17593006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208283 0039d316-1c4b-4281-b951-d872f2087c98

31 files changed, 118 insertions, 117 deletions

diff --git a/content/browser/accessibility/browser_accessibility_cocoa.h b/content/browser/accessibility/browser_accessibility_cocoa.h
index 387c5b2..a394822 100644
--- a/content/browser/accessibility/browser_accessibility_cocoa.h
+++ b/content/browser/accessibility/browser_accessibility_cocoa.h
@@ -7,9 +7,9 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/memory/scoped_nsobject.h"
-#import "content/browser/accessibility/browser_accessibility_delegate_mac.h"
+#import "base/mac/scoped_nsobject.h"
 #include "content/browser/accessibility/browser_accessibility.h"
+#import "content/browser/accessibility/browser_accessibility_delegate_mac.h"
 #include "content/common/accessibility_node_data.h"
 
 // BrowserAccessibilityCocoa is a cocoa wrapper around the BrowserAccessibility
@@ -19,7 +19,7 @@
 @interface BrowserAccessibilityCocoa : NSObject {
  @private
   content::BrowserAccessibility* browserAccessibility_;
-  scoped_nsobject<NSMutableArray> children_;
+  base::scoped_nsobject<NSMutableArray> children_;
   id<BrowserAccessibilityDelegateCocoa> delegate_;
 }
 
diff --git a/content/browser/accessibility/browser_accessibility_mac.h b/content/browser/accessibility/browser_accessibility_mac.h
index a3df865..4031854 100644
--- a/content/browser/accessibility/browser_accessibility_mac.h
+++ b/content/browser/accessibility/browser_accessibility_mac.h
@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "content/browser/accessibility/browser_accessibility.h"
 
 @class BrowserAccessibilityCocoa;
diff --git a/content/browser/accessibility/browser_accessibility_mac_unittest.mm b/content/browser/accessibility/browser_accessibility_mac_unittest.mm
index 292c628..50ae167 100644
--- a/content/browser/accessibility/browser_accessibility_mac_unittest.mm
+++ b/content/browser/accessibility/browser_accessibility_mac_unittest.mm
@@ -95,8 +95,8 @@ class BrowserAccessibilityTest : public ui::CocoaTest {
         retain]);
   }
 
-  scoped_nsobject<MockAccessibilityDelegate> delegate_;
-  scoped_nsobject<BrowserAccessibilityCocoa> accessibility_;
+  base::scoped_nsobject<MockAccessibilityDelegate> delegate_;
+  base::scoped_nsobject<BrowserAccessibilityCocoa> accessibility_;
   scoped_ptr<BrowserAccessibilityManager> manager_;
 };
 
diff --git a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
index 5d1be27..e637227 100644
--- a/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
+++ b/content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm
@@ -5,14 +5,14 @@
 #include "content/browser/gamepad/gamepad_platform_data_fetcher_mac.h"
 
 #include "base/mac/foundation_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time.h"
 
-#include <IOKit/hid/IOHIDKeys.h>
 #import <Foundation/Foundation.h>
+#include <IOKit/hid/IOHIDKeys.h>
 
 using WebKit::WebGamepad;
 using WebKit::WebGamepads;
@@ -60,7 +60,7 @@ GamepadPlatformDataFetcherMac::GamepadPlatformDataFetcherMac()
     return;
   }
 
-  scoped_nsobject<NSArray> criteria([[NSArray alloc] initWithObjects:
+  base::scoped_nsobject<NSArray> criteria([[NSArray alloc] initWithObjects:
       DeviceMatching(kGenericDesktopUsagePage, kJoystickUsageNumber),
       DeviceMatching(kGenericDesktopUsagePage, kGameUsageNumber),
       DeviceMatching(kGenericDesktopUsagePage, kMultiAxisUsageNumber),
diff --git a/content/browser/geolocation/core_location_data_provider_mac.h b/content/browser/geolocation/core_location_data_provider_mac.h
index 10e791b..29204aa 100644
--- a/content/browser/geolocation/core_location_data_provider_mac.h
+++ b/content/browser/geolocation/core_location_data_provider_mac.h
@@ -9,8 +9,8 @@
 #ifndef CONTENT_BROWSER_GEOLOCATION_CORE_LOCATION_DATA_PROVIDER_H_
 #define CONTENT_BROWSER_GEOLOCATION_CORE_LOCATION_DATA_PROVIDER_H_
 
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_nsobject.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/geoposition.h"
 
@@ -44,7 +44,7 @@ class CoreLocationDataProviderMac
   void PositionUpdated(Geoposition position);
 
   // The wrapper class that supplies this class with position data
-  scoped_nsobject<CoreLocationWrapperMac> wrapper_;
+  base::scoped_nsobject<CoreLocationWrapperMac> wrapper_;
   // The LocationProvider class that should receive position data
   CoreLocationProviderMac* provider_;
 };
diff --git a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
index ab4a729..81930e0 100644
--- a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
+++ b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
@@ -10,7 +10,7 @@
 #import <Foundation/Foundation.h>
 
 #include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/sys_string_conversions.h"
 
@@ -58,8 +58,8 @@ class CoreWlanApi : public WifiDataProviderCommon::WlanApiInterface {
   virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) OVERRIDE;
 
  private:
-  scoped_nsobject<NSBundle> bundle_;
-  scoped_nsobject<NSString> merge_key_;
+  base::scoped_nsobject<NSBundle> bundle_;
+  base::scoped_nsobject<NSString> merge_key_;
 
   DISALLOW_COPY_AND_ASSIGN(CoreWlanApi);
 };
diff --git a/content/browser/renderer_host/clipboard_message_filter_mac.mm b/content/browser/renderer_host/clipboard_message_filter_mac.mm
index cdeabe6..ee8f5a3 100644
--- a/content/browser/renderer_host/clipboard_message_filter_mac.mm
+++ b/content/browser/renderer_host/clipboard_message_filter_mac.mm
@@ -9,6 +9,7 @@
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #import "ui/base/cocoa/find_pasteboard.h"
@@ -31,7 +32,7 @@ class WriteFindPboardWrapper {
   }
 
  private:
-  scoped_nsobject<NSString> text_;
+  base::scoped_nsobject<NSString> text_;
 
   DISALLOW_COPY_AND_ASSIGN(WriteFindPboardWrapper);
 };
diff --git a/content/browser/renderer_host/compositing_iosurface_context_mac.h b/content/browser/renderer_host/compositing_iosurface_context_mac.h
index e21839c..84ffc63 100644
--- a/content/browser/renderer_host/compositing_iosurface_context_mac.h
+++ b/content/browser/renderer_host/compositing_iosurface_context_mac.h
@@ -11,8 +11,8 @@
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 
 namespace content {
@@ -53,7 +53,7 @@ class CompositingIOSurfaceContext
   ~CompositingIOSurfaceContext();
 
   int window_number_;
-  scoped_nsobject<NSOpenGLContext> nsgl_context_;
+  base::scoped_nsobject<NSOpenGLContext> nsgl_context_;
   CGLContextObj cgl_context_; // weak, backed by |nsgl_context_|
   bool is_vsync_disabled_;
   scoped_ptr<CompositingIOSurfaceShaderPrograms> shader_program_cache_;
diff --git a/content/browser/renderer_host/compositing_iosurface_context_mac.mm b/content/browser/renderer_host/compositing_iosurface_context_mac.mm
index b7909cb..6394fe3 100644
--- a/content/browser/renderer_host/compositing_iosurface_context_mac.mm
+++ b/content/browser/renderer_host/compositing_iosurface_context_mac.mm
@@ -37,7 +37,7 @@ CompositingIOSurfaceContext::Get(int window_number) {
     attributes.push_back(NSOpenGLPFAAllowOfflineRenderers);
   attributes.push_back(0);
 
-  scoped_nsobject<NSOpenGLPixelFormat> glPixelFormat(
+  base::scoped_nsobject<NSOpenGLPixelFormat> glPixelFormat(
       [[NSOpenGLPixelFormat alloc] initWithAttributes:&attributes.front()]);
   if (!glPixelFormat) {
     LOG(ERROR) << "NSOpenGLPixelFormat initWithAttributes failed";
@@ -49,9 +49,9 @@ CompositingIOSurfaceContext::Get(int window_number) {
   NSOpenGLContext* share_context = nil;
   if (!window_map()->empty())
     share_context = window_map()->begin()->second->nsgl_context();
-    scoped_nsobject<NSOpenGLContext> nsgl_context(
-        [[NSOpenGLContext alloc] initWithFormat:glPixelFormat
-                                   shareContext:share_context]);
+  base::scoped_nsobject<NSOpenGLContext> nsgl_context(
+      [[NSOpenGLContext alloc] initWithFormat:glPixelFormat
+                                 shareContext:share_context]);
   if (!nsgl_context) {
     LOG(ERROR) << "NSOpenGLContext initWithFormat failed";
     return NULL;
diff --git a/content/browser/renderer_host/popup_menu_helper_mac.mm b/content/browser/renderer_host/popup_menu_helper_mac.mm
index 448dea5..d3f7063 100644
--- a/content/browser/renderer_host/popup_menu_helper_mac.mm
+++ b/content/browser/renderer_host/popup_menu_helper_mac.mm
@@ -6,8 +6,8 @@
 
 #include "content/browser/renderer_host/popup_menu_helper_mac.h"
 
+#include "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_sending_event.h"
-#include "base/memory/scoped_nsobject.h"
 #include "base/message_loop.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
@@ -49,16 +49,16 @@ void PopupMenuHelper::ShowPopupMenu(
   // dealloced if my Destroy() method is called while the pop-up's up (which
   // would in turn delete me, causing a crash once the -runMenuInView
   // call returns. That's what was happening in <http://crbug.com/33250>).
- RenderWidgetHostViewMac* rwhvm =
-     static_cast<RenderWidgetHostViewMac*>(GetRenderWidgetHostView());
-  scoped_nsobject<RenderWidgetHostViewCocoa> cocoa_view
-      ([rwhvm->cocoa_view() retain]);
+  RenderWidgetHostViewMac* rwhvm =
+      static_cast<RenderWidgetHostViewMac*>(GetRenderWidgetHostView());
+  base::scoped_nsobject<RenderWidgetHostViewCocoa> cocoa_view(
+      [rwhvm->cocoa_view() retain]);
 
   // Display the menu.
-  scoped_nsobject<WebMenuRunner> menu_runner;
-  menu_runner.reset([[WebMenuRunner alloc] initWithItems:items
-                                                fontSize:item_font_size
-                                            rightAligned:right_aligned]);
+  base::scoped_nsobject<WebMenuRunner> menu_runner;
+   menu_runner.reset([[WebMenuRunner alloc] initWithItems:items
+                                                 fontSize:item_font_size
+                                             rightAligned:right_aligned]);
 
   {
     // Make sure events can be pumped while the menu is up.
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.h b/content/browser/renderer_host/render_widget_host_view_mac.h
index 63fad45..1b59990 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.h
+++ b/content/browser/renderer_host/render_widget_host_view_mac.h
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
@@ -62,7 +62,7 @@ class RenderWidgetHostViewMacEditCommandHelper;
   id trackingRectOwner_;              // (not retained)
   void* trackingRectUserData_;
   NSTrackingRectTag lastToolTipTag_;
-  scoped_nsobject<NSString> toolTip_;
+  base::scoped_nsobject<NSString> toolTip_;
 
   // Is YES if there was a mouse-down as yet unbalanced with a mouse-up.
   BOOL hasOpenMouseDown_;
@@ -70,7 +70,7 @@ class RenderWidgetHostViewMacEditCommandHelper;
   NSWindow* lastWindow_;  // weak
 
   // The cursor for the page. This is passed up from the renderer.
-  scoped_nsobject<NSCursor> currentCursor_;
+  base::scoped_nsobject<NSCursor> currentCursor_;
 
   // Variables used by our implementaion of the NSTextInput protocol.
   // An input method of Mac calls the methods of this protocol not only to
@@ -84,7 +84,7 @@ class RenderWidgetHostViewMacEditCommandHelper;
   // handler which receives input-method events from the renderer.
 
   // Represents the input-method attributes supported by this object.
-  scoped_nsobject<NSArray> validAttributesForMarkedText_;
+  base::scoped_nsobject<NSArray> validAttributesForMarkedText_;
 
   // Indicates if we are currently handling a key down event.
   BOOL handlingKeyDown_;
@@ -399,8 +399,8 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase,
   ui::TextInputType text_input_type_;
   bool can_compose_inline_;
 
-  scoped_nsobject<CALayer> software_layer_;
-  scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_;
+  base::scoped_nsobject<CALayer> software_layer_;
+  base::scoped_nsobject<CompositingIOSurfaceLayer> compositing_iosurface_layer_;
   scoped_ptr<CompositingIOSurfaceMac> compositing_iosurface_;
 
   // Whether to allow overlapping views.
@@ -507,11 +507,11 @@ class RenderWidgetHostViewMac : public RenderWidgetHostViewBase,
   std::string selected_text_;
 
   // The window used for popup widgets.
-  scoped_nsobject<NSWindow> popup_window_;
+  base::scoped_nsobject<NSWindow> popup_window_;
 
   // The fullscreen window used for pepper flash.
-  scoped_nsobject<NSWindow> pepper_fullscreen_window_;
-  scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
+  base::scoped_nsobject<NSWindow> pepper_fullscreen_window_;
+  base::scoped_nsobject<FullscreenWindowManager> fullscreen_window_manager_;
   // Our parent host view, if this is fullscreen.  NULL otherwise.
   RenderWidgetHostViewMac* fullscreen_parent_host_view_;
 
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm
index 21655da..c501e72 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -14,8 +14,8 @@
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/mac/sdk_forward_declarations.h"
-#import "base/memory/scoped_nsobject.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
@@ -2144,7 +2144,7 @@ void RenderWidgetHostViewMac::FrameSwapped() {
     return;
   }
 
-  scoped_nsobject<RenderWidgetHostViewCocoa> keepSelfAlive([self retain]);
+  base::scoped_nsobject<RenderWidgetHostViewCocoa> keepSelfAlive([self retain]);
 
   // Records the current marked text state, so that we can know if the marked
   // text was deleted or not after handling the key down event.
@@ -3699,8 +3699,8 @@ extern NSString *NSTextInputReplacementRangeAttributeName;
   const std::string& str = renderWidgetHostView_->selected_text();
   if (![types containsObject:NSStringPboardType] || str.empty()) return NO;
 
-  scoped_nsobject<NSString> text([[NSString alloc]
-                                   initWithUTF8String:str.c_str()]);
+  base::scoped_nsobject<NSString> text(
+      [[NSString alloc] initWithUTF8String:str.c_str()]);
   NSArray* toDeclare = [NSArray arrayWithObject:NSStringPboardType];
   [pboard declareTypes:toDeclare owner:nil];
   return [pboard setString:text forType:NSStringPboardType];
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
index 99748c6..72cf00f 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
@@ -203,7 +203,7 @@ class RenderWidgetHostViewMacTest : public RenderViewHostImplTestHarness {
 
  protected:
   RenderWidgetHostViewMac* rwhv_mac_;
-  scoped_nsobject<RenderWidgetHostViewCocoa> rwhv_cocoa_;
+  base::scoped_nsobject<RenderWidgetHostViewCocoa> rwhv_cocoa_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMacTest);
@@ -226,8 +226,8 @@ TEST_F(RenderWidgetHostViewMacTest, AcceptsFirstResponder) {
 }
 
 TEST_F(RenderWidgetHostViewMacTest, TakesFocusOnMouseDown) {
-  scoped_nsobject<CocoaTestHelperWindow>
-      window([[CocoaTestHelperWindow alloc] init]);
+  base::scoped_nsobject<CocoaTestHelperWindow> window(
+      [[CocoaTestHelperWindow alloc] init]);
   [[window contentView] addSubview:rwhv_cocoa_.get()];
 
   // Even if the RWHVCocoa disallows first responder, clicking on it gives it
@@ -658,8 +658,8 @@ TEST_F(RenderWidgetHostViewMacTest, BlurAndFocusOnSetActive) {
   RenderWidgetHostViewMac* view = static_cast<RenderWidgetHostViewMac*>(
       RenderWidgetHostView::CreateViewForWidget(rwh));
 
-  scoped_nsobject<CocoaTestHelperWindow>
-      window([[CocoaTestHelperWindow alloc] init]);
+  base::scoped_nsobject<CocoaTestHelperWindow> window(
+      [[CocoaTestHelperWindow alloc] init]);
   [[window contentView] addSubview:view->cocoa_view()];
 
   EXPECT_CALL(*rwh, Focus());
@@ -744,8 +744,8 @@ TEST_F(RenderWidgetHostViewMacTest, IgnoreEmptyUnhandledWheelEvent) {
       RenderWidgetHostView::CreateViewForWidget(host));
 
   // Add a delegate to the view.
-  scoped_nsobject<MockRenderWidgetHostViewMacDelegate> view_delegate(
-    [[MockRenderWidgetHostViewMacDelegate alloc] init]);
+  base::scoped_nsobject<MockRenderWidgetHostViewMacDelegate> view_delegate(
+      [[MockRenderWidgetHostViewMacDelegate alloc] init]);
   view->SetDelegate(view_delegate.get());
 
   // Send an initial wheel event for scrolling by 3 lines.
diff --git a/content/browser/renderer_host/text_input_client_mac.h b/content/browser/renderer_host/text_input_client_mac.h
index 46d8512..53318f9 100644
--- a/content/browser/renderer_host/text_input_client_mac.h
+++ b/content/browser/renderer_host/text_input_client_mac.h
@@ -7,7 +7,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
@@ -77,7 +77,7 @@ class CONTENT_EXPORT TextInputClientMac {
 
   NSUInteger character_index_;
   NSRect first_rect_;
-  scoped_nsobject<NSAttributedString> substring_;
+  base::scoped_nsobject<NSAttributedString> substring_;
 
   base::Lock lock_;
   base::ConditionVariable condition_;
diff --git a/content/browser/renderer_host/text_input_client_mac_unittest.mm b/content/browser/renderer_host/text_input_client_mac_unittest.mm
index 1158055..efb17b2 100644
--- a/content/browser/renderer_host/text_input_client_mac_unittest.mm
+++ b/content/browser/renderer_host/text_input_client_mac_unittest.mm
@@ -203,7 +203,7 @@ TEST_F(TextInputClientMacTest, GetSubstring) {
   NSDictionary* attributes =
       [NSDictionary dictionaryWithObject:[NSColor purpleColor]
                                   forKey:NSForegroundColorAttributeName];
-  scoped_nsobject<NSAttributedString> kSuccessValue(
+  base::scoped_nsobject<NSAttributedString> kSuccessValue(
       [[NSAttributedString alloc] initWithString:@"Barney is a purple dinosaur"
                                       attributes:attributes]);
 
diff --git a/content/browser/renderer_host/text_input_client_message_filter.mm b/content/browser/renderer_host/text_input_client_message_filter.mm
index 0849e02..5c8dfd9 100644
--- a/content/browser/renderer_host/text_input_client_message_filter.mm
+++ b/content/browser/renderer_host/text_input_client_message_filter.mm
@@ -4,7 +4,7 @@
 
 #include "content/browser/renderer_host/text_input_client_message_filter.h"
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/text_input_client_mac.h"
diff --git a/content/browser/renderer_host/webmenurunner_mac.h b/content/browser/renderer_host/webmenurunner_mac.h
index cdd7d61..28afb19 100644
--- a/content/browser/renderer_host/webmenurunner_mac.h
+++ b/content/browser/renderer_host/webmenurunner_mac.h
@@ -9,7 +9,7 @@
 
 #include <vector>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "webkit/common/webmenuitem.h"
 
 
@@ -22,7 +22,7 @@
 @interface WebMenuRunner : NSObject {
  @private
   // The native menu control.
-  scoped_nsobject<NSMenu> menu_;
+  base::scoped_nsobject<NSMenu> menu_;
 
   // A flag set to YES if a menu item was chosen, or NO if the menu was
   // dismissed without selecting an item.
diff --git a/content/browser/renderer_host/webmenurunner_mac.mm b/content/browser/renderer_host/webmenurunner_mac.mm
index 5fe8535..2ff5137 100644
--- a/content/browser/renderer_host/webmenurunner_mac.mm
+++ b/content/browser/renderer_host/webmenurunner_mac.mm
@@ -54,9 +54,9 @@
 
   // Set various alignment/language attributes. Note that many (if not most) of
   // these attributes are functional only on 10.6 and above.
-  scoped_nsobject<NSMutableDictionary> attrs(
+  base::scoped_nsobject<NSMutableDictionary> attrs(
       [[NSMutableDictionary alloc] initWithCapacity:3]);
-  scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
+  base::scoped_nsobject<NSMutableParagraphStyle> paragraphStyle(
       [[NSMutableParagraphStyle alloc] init]);
   [paragraphStyle setAlignment:rightAligned_ ? NSRightTextAlignment
                                              : NSLeftTextAlignment];
@@ -67,10 +67,10 @@
   [attrs setObject:paragraphStyle forKey:NSParagraphStyleAttributeName];
 
   if (item.has_directional_override) {
-    scoped_nsobject<NSNumber> directionValue(
+    base::scoped_nsobject<NSNumber> directionValue(
         [[NSNumber alloc] initWithInteger:
             writingDirection + NSTextWritingDirectionOverride]);
-    scoped_nsobject<NSArray> directionArray(
+    base::scoped_nsobject<NSArray> directionArray(
         [[NSArray alloc] initWithObjects:directionValue.get(), nil]);
     [attrs setObject:directionArray forKey:NSWritingDirectionAttributeName];
   }
@@ -78,9 +78,8 @@
   [attrs setObject:[NSFont menuFontOfSize:fontSize_]
             forKey:NSFontAttributeName];
 
-  scoped_nsobject<NSAttributedString> attrTitle(
-      [[NSAttributedString alloc] initWithString:title
-                                      attributes:attrs]);
+  base::scoped_nsobject<NSAttributedString> attrTitle(
+      [[NSAttributedString alloc] initWithString:title attributes:attrs]);
   [menuItem setAttributedTitle:attrTitle];
 
   [menuItem setTag:[menu_ numberOfItems] - 1];
@@ -104,8 +103,8 @@
   // Set up the button cell, converting to NSView coordinates. The menu is
   // positioned such that the currently selected menu item appears over the
   // popup button, which is the expected Mac popup menu behavior.
-  scoped_nsobject<NSPopUpButtonCell>
-      cell([[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
+  base::scoped_nsobject<NSPopUpButtonCell> cell(
+      [[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]);
   [cell setMenu:menu_];
   // We use selectItemWithTag below so if the index is out-of-bounds nothing
   // bad happens.
@@ -127,7 +126,8 @@
   // Unfortunately, instead of popping up above the passed |bounds|,
   // it pops up above the bounds of the view passed to inView:.  Use a
   // dummy view to fake this out.
-  scoped_nsobject<NSView> dummyView([[NSView alloc] initWithFrame:bounds]);
+  base::scoped_nsobject<NSView> dummyView(
+      [[NSView alloc] initWithFrame:bounds]);
   [view addSubview:dummyView];
 
   // Display the menu, and set a flag if a menu item was chosen.
diff --git a/content/browser/web_contents/web_contents_view_mac.h b/content/browser/web_contents/web_contents_view_mac.h
index 58aac4b..16dffcd 100644
--- a/content/browser/web_contents/web_contents_view_mac.h
+++ b/content/browser/web_contents/web_contents_view_mac.h
@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "content/common/drag_event_source_info.h"
@@ -38,8 +38,8 @@ CONTENT_EXPORT
 @interface WebContentsViewCocoa : BaseView {
  @private
   content::WebContentsViewMac* webContentsView_;  // WEAK; owns us
-  scoped_nsobject<WebDragSource> dragSource_;
-  scoped_nsobject<WebDragDest> dragDest_;
+  base::scoped_nsobject<WebDragSource> dragSource_;
+  base::scoped_nsobject<WebDragDest> dragDest_;
   BOOL mouseDownCanMoveWindow_;
 }
 
@@ -125,11 +125,11 @@ class WebContentsViewMac : public WebContentsViewPort,
   WebContentsImpl* web_contents_;
 
   // The Cocoa NSView that lives in the view hierarchy.
-  scoped_nsobject<WebContentsViewCocoa> cocoa_view_;
+  base::scoped_nsobject<WebContentsViewCocoa> cocoa_view_;
 
   // Keeps track of which NSView has focus so we can restore the focus when
   // focus returns.
-  scoped_nsobject<FocusTracker> focus_tracker_;
+  base::scoped_nsobject<FocusTracker> focus_tracker_;
 
   // Our optional delegate.
   scoped_ptr<WebContentsViewDelegate> delegate_;
diff --git a/content/browser/web_contents/web_contents_view_mac_unittest.mm b/content/browser/web_contents/web_contents_view_mac_unittest.mm
index e1ef379..71f7e48 100644
--- a/content/browser/web_contents/web_contents_view_mac_unittest.mm
+++ b/content/browser/web_contents/web_contents_view_mac_unittest.mm
@@ -4,10 +4,10 @@
 
 #import "content/browser/web_contents/web_contents_view_mac.h"
 
-#include "base/memory/scoped_nsobject.h"
-#import "ui/base/test/ui_cocoa_test_helper.h"
+#include "base/mac/scoped_nsobject.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
+#import "ui/base/test/ui_cocoa_test_helper.h"
 
 namespace {
 
@@ -15,8 +15,8 @@ class WebContentsViewCocoaTest : public ui::CocoaTest {
 };
 
 TEST_F(WebContentsViewCocoaTest, NonWebDragSourceTest) {
-  scoped_nsobject<WebContentsViewCocoa>
-      view([[WebContentsViewCocoa alloc] init]);
+  base::scoped_nsobject<WebContentsViewCocoa> view(
+      [[WebContentsViewCocoa alloc] init]);
 
   // Tests that |draggingSourceOperationMaskForLocal:| returns the expected mask
   // when dragging without a WebDragSource - i.e. when |startDragWithDropData:|
diff --git a/content/browser/web_contents/web_drag_dest_mac_unittest.mm b/content/browser/web_contents/web_drag_dest_mac_unittest.mm
index 1dc7fef..028f137 100644
--- a/content/browser/web_contents/web_drag_dest_mac_unittest.mm
+++ b/content/browser/web_contents/web_drag_dest_mac_unittest.mm
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/mac/scoped_nsautorelease_pool.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
@@ -53,7 +53,7 @@ class WebDragDestTest : public RenderViewHostImplTestHarness {
   }
 
   base::mac::ScopedNSAutoreleasePool pool_;
-  scoped_nsobject<WebDragDest> drag_dest_;
+  base::scoped_nsobject<WebDragDest> drag_dest_;
 };
 
 // Make sure nothing leaks.
@@ -64,7 +64,7 @@ TEST_F(WebDragDestTest, Init) {
 // Test flipping of coordinates given a point in window coordinates.
 TEST_F(WebDragDestTest, Flip) {
   NSPoint windowPoint = NSZeroPoint;
-  scoped_nsobject<NSWindow> window([[CocoaTestHelperWindow alloc] init]);
+  base::scoped_nsobject<NSWindow> window([[CocoaTestHelperWindow alloc] init]);
   NSPoint viewPoint =
       [drag_dest_ flipWindowPointToView:windowPoint
                                    view:[window contentView]];
diff --git a/content/browser/web_contents/web_drag_source_mac.h b/content/browser/web_contents/web_drag_source_mac.h
index e172551..87fb2b6 100644
--- a/content/browser/web_contents/web_drag_source_mac.h
+++ b/content/browser/web_contents/web_drag_source_mac.h
@@ -6,7 +6,7 @@
 
 #include "base/files/file_path.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "googleurl/src/gurl.h"
@@ -31,13 +31,13 @@ CONTENT_EXPORT
   scoped_ptr<WebDropData> dropData_;
 
   // The image to show as drag image. Can be nil.
-  scoped_nsobject<NSImage> dragImage_;
+  base::scoped_nsobject<NSImage> dragImage_;
 
   // The offset to draw |dragImage_| at.
   NSPoint imageOffset_;
 
   // Our pasteboard.
-  scoped_nsobject<NSPasteboard> pasteboard_;
+  base::scoped_nsobject<NSPasteboard> pasteboard_;
 
   // A mask of the allowed drag operations.
   NSDragOperation dragOperationMask_;
diff --git a/content/browser/web_contents/web_drag_source_mac_unittest.mm b/content/browser/web_contents/web_drag_source_mac_unittest.mm
index 0ffeeb6..96a401c 100644
--- a/content/browser/web_contents/web_drag_source_mac_unittest.mm
+++ b/content/browser/web_contents/web_drag_source_mac_unittest.mm
@@ -16,25 +16,24 @@ typedef RenderViewHostTestHarness WebDragSourceMacTest;
 
 TEST_F(WebDragSourceMacTest, DragInvalidlyEscapedBookmarklet) {
   scoped_ptr<WebContents> contents(CreateTestWebContents());
-  scoped_nsobject<NSView> view(
+  base::scoped_nsobject<NSView> view(
       [[NSView alloc] initWithFrame:NSMakeRect(0, 0, 10, 10)]);
 
   scoped_ptr<WebDropData> dropData(new WebDropData);
   dropData->url = GURL("javascript:%");
 
   WebContentsImpl* contentsImpl = static_cast<WebContentsImpl*>(contents.get());
-  scoped_nsobject<WebDragSource> source(
-      [[WebDragSource alloc]
-        initWithContents:contentsImpl
-                    view:view
-                dropData:dropData.get()
-                   image:nil
-                  offset:NSMakePoint(0, 0)
-              pasteboard:[NSPasteboard pasteboardWithUniqueName]
-        dragOperationMask:NSDragOperationCopy]);
+  base::scoped_nsobject<WebDragSource> source([[WebDragSource alloc]
+      initWithContents:contentsImpl
+                  view:view
+              dropData:dropData.get()
+                 image:nil
+                offset:NSMakePoint(0, 0)
+            pasteboard:[NSPasteboard pasteboardWithUniqueName]
+     dragOperationMask:NSDragOperationCopy]);
 
   // Test that this call doesn't throw any exceptions: http://crbug.com/128371
-  scoped_nsobject<NSPasteboard> pasteboard(
+  base::scoped_nsobject<NSPasteboard> pasteboard(
       [NSPasteboard pasteboardWithUniqueName]);
   [source lazyWriteToPasteboard:pasteboard forType:NSURLPboardType];
 }
diff --git a/content/common/mac/attributed_string_coder.mm b/content/common/mac/attributed_string_coder.mm
index 37af9de..2f32ec3 100644
--- a/content/common/mac/attributed_string_coder.mm
+++ b/content/common/mac/attributed_string_coder.mm
@@ -7,7 +7,7 @@
 #include <AppKit/AppKit.h>
 
 #include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/common/view_messages.h"
@@ -45,7 +45,7 @@ NSAttributedString* AttributedStringCoder::Decode(
     const AttributedStringCoder::EncodedString* str) {
   // Create the return value.
   NSString* plain_text = base::SysUTF16ToNSString(str->string());
-  scoped_nsobject<NSMutableAttributedString> decoded_string(
+  base::scoped_nsobject<NSMutableAttributedString> decoded_string(
       [[NSMutableAttributedString alloc] initWithString:plain_text]);
   // Iterate over all the encoded attributes, attaching each to the string.
   const std::vector<FontAttribute> attributes = str->attributes();
diff --git a/content/common/mac/attributed_string_coder_unittest.mm b/content/common/mac/attributed_string_coder_unittest.mm
index 9555fc5..a98c48a 100644
--- a/content/common/mac/attributed_string_coder_unittest.mm
+++ b/content/common/mac/attributed_string_coder_unittest.mm
@@ -4,7 +4,7 @@
 
 #include <AppKit/AppKit.h>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/utf_string_conversions.h"
 #import "content/common/mac/attributed_string_coder.h"
@@ -33,7 +33,7 @@ class AttributedStringCoderTest : public testing::Test {
 };
 
 TEST_F(AttributedStringCoderTest, SimpleString) {
-  scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
+  base::scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
   [attr_str addAttributes:FontAttribute(@"Helvetica", 12.5)
                     range:NSMakeRange(0, [attr_str length])];
 
@@ -42,13 +42,13 @@ TEST_F(AttributedStringCoderTest, SimpleString) {
 }
 
 TEST_F(AttributedStringCoderTest, NoAttributes) {
-  scoped_nsobject<NSAttributedString> attr_str(NewAttrString());
+  base::scoped_nsobject<NSAttributedString> attr_str(NewAttrString());
   NSAttributedString* decoded = EncodeAndDecode(attr_str.get());
   EXPECT_NSEQ(attr_str.get(), decoded);
 }
 
 TEST_F(AttributedStringCoderTest, StripColor) {
-  scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
+  base::scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
   const NSUInteger kStringLength = [attr_str length];
   [attr_str addAttribute:NSFontAttributeName
                    value:[NSFont systemFontOfSize:26]
@@ -68,7 +68,7 @@ TEST_F(AttributedStringCoderTest, StripColor) {
 }
 
 TEST_F(AttributedStringCoderTest, MultipleFonts) {
-  scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
+  base::scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
   [attr_str setAttributes:FontAttribute(@"Courier", 12)
                     range:NSMakeRange(0, 10)];
   [attr_str addAttributes:FontAttribute(@"Helvetica", 16)
@@ -82,7 +82,7 @@ TEST_F(AttributedStringCoderTest, MultipleFonts) {
 }
 
 TEST_F(AttributedStringCoderTest, NoPertinentAttributes) {
-  scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
+  base::scoped_nsobject<NSMutableAttributedString> attr_str(NewAttrString());
   [attr_str addAttribute:NSForegroundColorAttributeName
                    value:[NSColor blueColor]
                    range:NSMakeRange(0, 10)];
@@ -95,7 +95,7 @@ TEST_F(AttributedStringCoderTest, NoPertinentAttributes) {
 
   NSAttributedString* decoded = EncodeAndDecode(attr_str.get());
 
-  scoped_nsobject<NSAttributedString> expected(NewAttrString());
+  base::scoped_nsobject<NSAttributedString> expected(NewAttrString());
   EXPECT_NSEQ(expected.get(), decoded);
 }
 
diff --git a/content/common/mac/font_loader.mm b/content/common/mac/font_loader.mm
index bbb9852..6ecb7ca 100644
--- a/content/common/mac/font_loader.mm
+++ b/content/common/mac/font_loader.mm
@@ -13,7 +13,7 @@
 #include "base/mac/foundation_util.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/common/mac/font_descriptor.h"
@@ -112,7 +112,7 @@ void FontLoader::LoadFont(const FontDescriptor& font,
   // it becomes impossible for the system to the find the original file ref
   // since the font now lives in memory as far as it's concerned.
   CTFontRef ct_font_to_encode = (CTFontRef)font_to_encode;
-  scoped_nsobject<NSURL> font_url(
+  base::scoped_nsobject<NSURL> font_url(
       base::mac::CFToNSCast(base::mac::CFCastStrict<CFURLRef>(
           CTFontCopyAttribute(ct_font_to_encode, kCTFontURLAttribute))));
   if (![font_url isFileURL]) {
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index 9fd2657..b58c332 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -20,7 +20,7 @@ extern "C" {
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/rand_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
@@ -392,12 +392,12 @@ NSString* LoadSandboxTemplate(int sandbox_type) {
     return nil;
   }
 
-  scoped_nsobject<NSString> common_sandbox_prefix_data(
+  base::scoped_nsobject<NSString> common_sandbox_prefix_data(
       [[NSString alloc] initWithBytes:common_sandbox_definition.data()
                                length:common_sandbox_definition.length()
                              encoding:NSUTF8StringEncoding]);
 
-  scoped_nsobject<NSString> sandbox_data(
+  base::scoped_nsobject<NSString> sandbox_data(
       [[NSString alloc] initWithBytes:sandbox_definition.data()
                                length:sandbox_definition.length()
                              encoding:NSUTF8StringEncoding]);
diff --git a/content/shell/shell_browser_main_parts_mac.mm b/content/shell/shell_browser_main_parts_mac.mm
index 687c161..b2b84b7 100644
--- a/content/shell/shell_browser_main_parts_mac.mm
+++ b/content/shell/shell_browser_main_parts_mac.mm
@@ -7,7 +7,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/bundle_locations.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "content/shell/shell_application_mac.h"
 
 namespace content {
@@ -16,9 +16,9 @@ void ShellBrowserMainParts::PreMainMessageLoopStart() {
   // Force the NSApplication subclass to be used.
   [ShellCrApplication sharedApplication];
 
-  scoped_nsobject<NSNib>
-      nib([[NSNib alloc] initWithNibNamed:@"MainMenu"
-                                   bundle:base::mac::FrameworkBundle()]);
+  base::scoped_nsobject<NSNib> nib(
+      [[NSNib alloc] initWithNibNamed:@"MainMenu"
+                               bundle:base::mac::FrameworkBundle()]);
   [nib instantiateNibWithOwner:NSApp topLevelObjects:nil];
 }
 
diff --git a/content/shell/shell_javascript_dialog_mac.mm b/content/shell/shell_javascript_dialog_mac.mm
index 6bdd9ab..0a89a89 100644
--- a/content/shell/shell_javascript_dialog_mac.mm
+++ b/content/shell/shell_javascript_dialog_mac.mm
@@ -6,7 +6,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/shell/shell_javascript_dialog_manager.h"
 
@@ -14,7 +14,7 @@
 // going away. Is responsible for cleaning itself up.
 @interface ShellJavaScriptDialogHelper : NSObject<NSAlertDelegate> {
  @private
-  scoped_nsobject<NSAlert> alert_;
+  base::scoped_nsobject<NSAlert> alert_;
   NSTextField* textField_;  // WEAK; owned by alert_
 
   // Copies of the fields in ShellJavaScriptDialog because they're private.
diff --git a/content/shell/shell_login_dialog_mac.mm b/content/shell/shell_login_dialog_mac.mm
index 5a5d4df..b7d6947 100644
--- a/content/shell/shell_login_dialog_mac.mm
+++ b/content/shell/shell_login_dialog_mac.mm
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #import "ui/base/cocoa/nib_loading.h"
@@ -24,7 +24,7 @@ const int kPasswordFieldTag = 2;
 // going away.
 @interface ShellLoginDialogHelper : NSObject<NSAlertDelegate> {
  @private
-  scoped_nsobject<NSAlert> alert_;
+  base::scoped_nsobject<NSAlert> alert_;
   NSTextField* usernameField_;  // WEAK; owned by alert_
   NSSecureTextField* passwordField_;  // WEAK; owned by alert_
 }
diff --git a/content/shell/shell_mac.mm b/content/shell/shell_mac.mm
index be92130..7bb3b30 100644
--- a/content/shell/shell_mac.mm
+++ b/content/shell/shell_mac.mm
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "base/logging.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/sys_string_conversions.h"
 #include "content/public/browser/native_web_keyboard_event.h"
@@ -106,7 +106,8 @@ void MakeShellButton(NSRect* rect,
                      NSView* target,
                      NSString* key,
                      NSUInteger modifier) {
-  scoped_nsobject<NSButton> button([[NSButton alloc] initWithFrame:*rect]);
+  base::scoped_nsobject<NSButton> button(
+      [[NSButton alloc] initWithFrame:*rect]);
   [button setTitle:title];
   [button setBezelStyle:NSSmallSquareBezelStyle];
   [button setAutoresizingMask:(NSViewMaxXMargin | NSViewMinYMargin)];
@@ -222,7 +223,7 @@ void Shell::PlatformCreateWindow(int width, int height) {
 
   button_frame.size.width =
       NSWidth(initial_window_bounds) - NSMinX(button_frame);
-  scoped_nsobject<NSTextField> url_edit_view(
+  base::scoped_nsobject<NSTextField> url_edit_view(
       [[NSTextField alloc] initWithFrame:button_frame]);
   [content addSubview:url_edit_view];
   [url_edit_view setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];