mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.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_BOOKMARKS_BOOKMARK_BAR_FOLDER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "ui/base/cocoa/tracking_area.h"
 
 class Profile;
 
 @class BookmarkBarController;
 @class BookmarkBarFolderView;
 @class BookmarkBarFolderHoverState;
 @class BookmarkBarFolderWindow;
 @class BookmarkBarFolderWindowContentView;
 @class BookmarkFolderTarget;
 
 // A controller for the pop-up windows from bookmark folder buttons
 // which look sort of like menus.
 @interface BookmarkBarFolderController :
     NSWindowController<BookmarkButtonDelegate,
                        BookmarkButtonControllerProtocol> {
  @private
   // The button whose click opened us.
-  scoped_nsobject<BookmarkButton> parentButton_;
+  base::scoped_nsobject<BookmarkButton> parentButton_;
 
   // Bookmark bar folder controller chains are torn down in two ways:
   // 1. Clicking "outside" the folder (see use of the NSEvent local event
   //    monitor in the bookmark bar controller).
   // 2. Engaging a different folder (via hover over or explicit click).
   //
   // In either case, the BookmarkButtonControllerProtocol method
   // closeAllBookmarkFolders gets called.  For bookmark bar folder
   // controllers, this is passed up the chain so we begin with a top
   // level "close".
   // When any bookmark folder window closes, it necessarily tells
   // subcontroller windows to close (down the chain), and autoreleases
   // the controller.  (Must autorelease since the controller can still
   // get delegate events such as windowDidClose).
   //
   // Bookmark bar folder controllers own their buttons.  When doing
   // drag and drop of a button from one sub-sub-folder to a different
   // sub-sub-folder, we need to make sure the button's pointers stay
   // valid until we've dropped (or cancelled).  Note that such a drag
   // causes the source sub-sub-folder (previous parent window) to go
   // away (windows close, controllers autoreleased) since you're
   // hovering over a different folder chain for dropping.  To keep
   // things valid (like the button's target, its delegate, the parent
   // cotroller that we have a pointer to below [below], etc), we heep
   // strong pointers to our owning controller, so the entire chain
   // stays owned.
 
   // Our parent controller, if we are a nested folder, otherwise nil.
   // Strong to insure the object lives as long as we need it.
-  scoped_nsobject<BookmarkBarFolderController> parentController_;
+  base::scoped_nsobject<BookmarkBarFolderController> parentController_;
 
   // The main bar controller from whence we or a parent sprang.
   BookmarkBarController* barController_;  // WEAK: It owns us.
 
   // Our buttons.  We do not have buttons for nested folders.
-  scoped_nsobject<NSMutableArray> buttons_;
+  base::scoped_nsobject<NSMutableArray> buttons_;
 
   // The scroll view that contains our main button view (below).
   IBOutlet NSScrollView* scrollView_;
 
   // The view defining the visible area in which we draw our content.
   IBOutlet BookmarkBarFolderWindowContentView* visibleView_;
 
   // The main view of this window (where the buttons go) within the scroller.
   IBOutlet BookmarkBarFolderView* folderView_;
 
@@ skipping 18 matching lines @@
   // Direction switches if we'd grow off the screen.
   BOOL subFolderGrowthToRight_;
 
   // Weak; we keep track to work around a
   // setShowsBorderOnlyWhileMouseInside bug.
   BookmarkButton* buttonThatMouseIsIn_;
 
   // We model hover state as a state machine with specific allowable
   // transitions.  |hoverState_| is the state of this machine at any
   // given time.
-  scoped_nsobject<BookmarkBarFolderHoverState> hoverState_;
+  base::scoped_nsobject<BookmarkBarFolderHoverState> hoverState_;
 
   // Logic for dealing with a click on a bookmark folder button.
-  scoped_nsobject<BookmarkFolderTarget> folderTarget_;
+  base::scoped_nsobject<BookmarkFolderTarget> folderTarget_;
 
   // A controller for a pop-up bookmark folder window (custom menu).
   // We (self) are the parentController_ for our folderController_.
   // This is not a scoped_nsobject because it owns itself (when its
   // window closes the controller gets autoreleased).
   BookmarkBarFolderController* folderController_;
 
   // Implement basic menu scrolling through this tracking area.
   ui::ScopedCrTrackingArea scrollTrackingArea_;
 
@@ skipping 87 matching lines @@
 - (NSView*)visibleView;
 - (NSScrollView*)scrollView;
 - (NSView*)folderView;
 
 - (IBAction)openBookmarkFolderFromButton:(id)sender;
 
 - (BookmarkButton*)buttonForDroppingOnAtPoint:(NSPoint)point;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_FOLDER_CONTROLLER_H_