mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/history_menu_bridge.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.
 
 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 189 matching lines @@
         continue;
 
       // Create the item for the parent/window. Do not set the title yet because
       // the actual number of items that are in the menu will not be known until
       // things like the NTP are filtered out, which is done when the tab items
       // are actually created.
       HistoryItem* item = new HistoryItem();
       item->session_id = entry_win->id;
 
       // Create the submenu.
-      scoped_nsobject<NSMenu> submenu([[NSMenu alloc] init]);
+      base::scoped_nsobject<NSMenu> submenu([[NSMenu alloc] init]);
 
       // Create standard items within the window submenu.
       NSString* restore_title = l10n_util::GetNSString(
           IDS_HISTORY_CLOSED_RESTORE_WINDOW_MAC);
-      scoped_nsobject<NSMenuItem> restore_item(
+      base::scoped_nsobject<NSMenuItem> restore_item(
           [[NSMenuItem alloc] initWithTitle:restore_title
                                      action:@selector(openHistoryMenuItem:)
                               keyEquivalent:@""]);
       [restore_item setTarget:controller_.get()];
       // Duplicate the HistoryItem otherwise the different NSMenuItems will
       // point to the same HistoryItem, which would then be double-freed when
       // removing the items from the map or in the dtor.
       HistoryItem* dup_item = new HistoryItem(*item);
       menu_item_map_.insert(std::make_pair(restore_item.get(), dup_item));
       [submenu addItem:restore_item.get()];
@@ skipping 263 matching lines @@
 }
 
 void HistoryMenuBridge::CancelFaviconRequest(HistoryItem* item) {
   DCHECK(item);
   if (item->icon_requested) {
     cancelable_task_tracker_.TryCancel(item->icon_task_id);
     item->icon_requested = false;
     item->icon_task_id = CancelableTaskTracker::kBadTaskId;
   }
 }