mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_EDITOR_BASE_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_EDITOR_BASE_CONTROLLER_H_
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
 #include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h"
 
 class BookmarkEditorBaseControllerBridge;
 class BookmarkModel;
 @class BookmarkTreeBrowserCell;
 
 // A base controller class for bookmark creation and editing dialogs which
 // present the current bookmark folder structure in a tree view.  Do not
@@ skipping 13 matching lines @@
   const BookmarkNode* parentNode_;  // weak; owned by the model
   GURL url_;  // This and title_ are only used for new urls.
   string16 title_;
   BookmarkEditor::Configuration configuration_;
   NSString* initialName_;
   NSString* displayName_;  // Bound to a text field in the dialog.
   BOOL okEnabled_;  // Bound to the OK button.
   BOOL creatingNewFolders_;  // True while in createNewFolders.
   // An array of BookmarkFolderInfo where each item describes a folder in the
   // BookmarkNode structure.
-  scoped_nsobject<NSArray> folderTreeArray_;
+  base::scoped_nsobject<NSArray> folderTreeArray_;
   // Bound to the table view giving a path to the current selections, of which
   // there should only ever be one.
-  scoped_nsobject<NSArray> tableSelectionPaths_;
+  base::scoped_nsobject<NSArray> tableSelectionPaths_;
   // C++ bridge object that observes the BookmarkModel for me.
   scoped_ptr<BookmarkEditorBaseControllerBridge> observer_;
 }
 
 @property(nonatomic, copy) NSString* initialName;
 @property(nonatomic, copy) NSString* displayName;
 @property(nonatomic, assign) BOOL okEnabled;
 @property(nonatomic, retain, readonly) NSArray* folderTreeArray;
 @property(nonatomic, copy) NSArray* tableSelectionPaths;
 
@@ skipping 118 matching lines @@
 
 // Select the given bookmark node within the tree view.
 - (void)selectTestNodeInBrowser:(const BookmarkNode*)node;
 
 // Return the dictionary for the folder selected in the tree.
 - (BookmarkFolderInfo*)selectedFolder;
 
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_EDITOR_BASE_CONTROLLER_H_