mac: Update clients of scoped_nsobject.h.

content/browser/renderer_host/popup_menu_helper_mac.mm

Index: content/browser/renderer_host/popup_menu_helper_mac.mm
diff --git a/content/browser/renderer_host/popup_menu_helper_mac.mm b/content/browser/renderer_host/popup_menu_helper_mac.mm
index 448dea58bc1c6368ec2075951837c299fab109dc..d3f70636ec6e5c15edafa48535690a348eaf301c 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.