mac: Update clients of scoped_nsobject.h.

content/browser/renderer_host/popup_menu_helper_mac.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 <Carbon/Carbon.h>
 
 #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"
 #include "content/browser/renderer_host/webmenurunner_mac.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #import "ui/base/cocoa/base_view.h"
 
 namespace content {
 
@@ skipping 21 matching lines @@
   // Only single selection list boxes show a popup on Mac.
   DCHECK(!allow_multiple_selection);
 
   if (!g_allow_showing_popup_menus)
     return;
 
   // Retain the Cocoa view for the duration of the pop-up so that it can't be
   // 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.
     base::MessageLoop::ScopedNestableTaskAllower allow(
         base::MessageLoop::current());
 
     // One of the events that could be pumped is |window.close()|.
     // User-initiated event-tracking loops protect against this by
     // setting flags in -[CrApplication sendEvent:], but since
     // web-content menus are initiated by IPC message the setup has to
@@ skipping 31 matching lines @@
 
 void PopupMenuHelper::Observe(int type,
                               const NotificationSource& source,
                               const NotificationDetails& details) {
   DCHECK(type == NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED);
   DCHECK(Source<RenderWidgetHost>(source).ptr() == render_view_host_);
   render_view_host_ = NULL;
 }
 
 }  // namespace content