mac: Update clients of scoped_nsobject.h.

content/browser/renderer_host/render_widget_host_view_mac.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_
 
 #import <Cocoa/Cocoa.h>
 #include <list>
 #include <map>
 #include <string>
 #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"
 #include "content/browser/accessibility/browser_accessibility_delegate_mac.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/edit_command.h"
 #import "content/public/browser/render_widget_host_view_mac_base.h"
 #include "ipc/ipc_sender.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "ui/base/cocoa/base_view.h"
@@ skipping 29 matching lines @@
   BOOL canBeKeyView_;
   BOOL takesFocusOnlyOnMouseDown_;
   BOOL closeOnDeactivate_;
   scoped_ptr<content::RenderWidgetHostViewMacEditCommandHelper>
       editCommand_helper_;
 
   // These are part of the magic tooltip code from WebKit's WebHTMLView:
   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_;
 
   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
   // notify an application of its status, but also to retrieve the status of
   // the application. That is, an application cannot control an input method
   // directly.
   // This object keeps the status of a composition of the renderer and returns
   // it when an input method asks for it.
   // We need to implement Objective-C methods for the NSTextInput protocol. On
   // the other hand, we need to implement a C++ method for an IPC-message
   // 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_;
 
   // Indicates if there is any marked text.
   BOOL hasMarkedText_;
 
   // Indicates if unmarkText is called or not when handling a keyboard
   // event.
   BOOL unmarkTextCalled_;
@@ skipping 294 matching lines @@
   // value returns true for is_null() if we are not recording whiteout times.
   base::TimeTicks whiteout_start_time_;
 
   // The time it took after this view was selected for it to be fully painted.
   base::TimeTicks web_contents_switch_paint_time_;
 
   // Current text input type.
   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.
   bool allow_overlapping_views_;
 
   // Whether to use the CoreAnimation path to draw content.
   bool use_core_animation_;
 
   ui::LatencyInfo software_latency_info_;
 
@@ skipping 86 matching lines @@
   // The text to be shown in the tooltip, supplied by the renderer.
   string16 tooltip_text_;
 
   // Factory used to safely scope delayed calls to ShutdownHost().
   base::WeakPtrFactory<RenderWidgetHostViewMac> weak_factory_;
 
   // selected text on the renderer.
   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_;
 
   // List of pending swaps for deferred acking:
   //   pairs of (route_id, gpu_host_id).
   std::list<std::pair<int32, int32> > pending_swap_buffers_acks_;
 
   // Factory used to cancel outstanding throttled AckPendingSwapBuffers calls.
   base::WeakPtrFactory<RenderWidgetHostViewMac>
       pending_swap_buffers_acks_weak_factory_;
@@ skipping 12 matching lines @@
 
   // Subscriber that listens to frame presentation events.
   scoped_ptr<RenderWidgetHostViewFrameSubscriber> frame_subscriber_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewMac);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_VIEW_MAC_H_