mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/history_menu_bridge.h

 // Copyright (c) 2011 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 CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_
 #define CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_
 
 #import <Cocoa/Cocoa.h>
 #include <map>
 #include <vector>
 
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_nsobject.h"
 #include "chrome/browser/common/cancelable_request.h"
 #import "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/sessions/tab_restore_service_observer.h"
 #import "chrome/browser/ui/cocoa/main_menu_item.h"
 #include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/notification_observer.h"
 
@@ skipping 44 matching lines @@
     HistoryItem();
     // Copy constructor allowed.
     HistoryItem(const HistoryItem& copy);
     ~HistoryItem();
 
     // The title for the menu item.
     string16 title;
     // The URL that will be navigated to if the user selects this item.
     GURL url;
     // Favicon for the URL.
-    scoped_nsobject<NSImage> icon;
+    base::scoped_nsobject<NSImage> icon;
 
     // If the icon is being requested from the FaviconService, |icon_requested|
     // will be true and |icon_task_id| will be valid. If this is false, then
     // |icon_task_id| will be CancelableTaskTracker::kBadTaskId.
     bool icon_requested;
     // The Handle given to us by the FaviconService for the icon fetch request.
     CancelableTaskTracker::TaskId icon_task_id;
 
     // The pointer to the item after it has been created. Strong; NSMenu also
     // retains this. During a rebuild flood (if the user closes a lot of tabs
     // quickly), the NSMenu can release the item before the HistoryItem has
     // been fully deleted. If this were a weak pointer, it would result in a
     // zombie.
-    scoped_nsobject<NSMenuItem> menu_item;
+    base::scoped_nsobject<NSMenuItem> menu_item;
 
     // This ID is unique for a browser session and can be passed to the
     // TabRestoreService to re-open the closed window or tab that this
     // references. A non-0 session ID indicates that this is an entry can be
     // restored that way. Otherwise, the URL will be used to open the item and
     // this ID will be 0.
     SessionID::id_type session_id;
 
     // If the HistoryItem is a window, this will be the vector of tabs. Note
     // that this is a list of weak references. The |menu_item_map_| is the owner
@@ skipping 94 matching lines @@
                       const chrome::FaviconImageResult& image_result);
 
   // Cancels a favicon load request for a given HistoryItem, if one is in
   // progress.
   void CancelFaviconRequest(HistoryItem* item);
 
  private:
   friend class ::HistoryMenuBridgeTest;
   friend class HistoryMenuCocoaControllerTest;
 
-  scoped_nsobject<HistoryMenuCocoaController> controller_;  // strong
+  base::scoped_nsobject<HistoryMenuCocoaController> controller_;  // strong
 
   Profile* profile_;  // weak
   HistoryService* history_service_;  // weak
   TabRestoreService* tab_restore_service_;  // weak
 
   content::NotificationRegistrar registrar_;
   CancelableRequestConsumer cancelable_request_consumer_;
   CancelableTaskTracker cancelable_task_tracker_;
 
   // Mapping of NSMenuItems to HistoryItems. This owns the HistoryItems until
   // they are removed and deleted via ClearMenuSection().
   std::map<NSMenuItem*, HistoryItem*> menu_item_map_;
 
   // Maps HistoryItems to favicon request Handles.
   CancelableRequestConsumerTSimple<HistoryItem*> favicon_consumer_;
 
   // Requests to re-create the menu are coalesced. |create_in_progress_| is true
   // when either waiting for the history service to return query results, or
   // when the menu is rebuilding. |need_recreate_| is true whenever a rebuild
   // has been scheduled but is waiting for the current one to finish.
   bool create_in_progress_;
   bool need_recreate_;
 
   // The default favicon if a HistoryItem does not have one.
-  scoped_nsobject<NSImage> default_favicon_;
+  base::scoped_nsobject<NSImage> default_favicon_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryMenuBridge);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_HISTORY_MENU_BRIDGE_H_