mac: Update clients of scoped_nsobject.h.

1.) The header is now in base/mac instead of base/memory
2.) The class is now in namespace base.

This CL was created programmatically by running:

1.)
    git grep -l memory/scoped_nsobject.h | xargs sed -i -e 's/memory\/scoped_nsobject.h/mac\/scoped_nsobject.h/g'
    for f in $(git diff --name-only origin); do tools/sort-headers.py $f -f; done
    git commit -a -m headers
    # manually undo changes to gypi file
    git cl upload # patch set 1
2.)
    git grep -l 'scoped_nsobject<' | xargs sed -i -e 's/scoped_nsobject</base::scoped_nsobject</g'
    # manually undo comment changes in scoped_nsobject.h, tracking_area.h
    git commit -a -m format
    git cl upload # patch set 2
    # Manually audit all files, file bugs and clean up bad clang-format decisions
    git cl upload # patch set 3
BUG=251957
TBR=mark@chromium.org

Review URL: https://codereview.chromium.org/17593006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208283 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 3 deletions

diff --git a/chrome/browser/ui/cocoa/task_manager_mac.h b/chrome/browser/ui/cocoa/task_manager_mac.h
index 6e804b9..093f9f4 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.h
+++ b/chrome/browser/ui/cocoa/task_manager_mac.h
@@ -8,7 +8,7 @@
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/cocoa/table_row_nsimage_cache.h"
 
@@ -31,7 +31,7 @@ class ImageSkia;
   TaskManager* taskManager_;  // weak
   TaskManagerModel* model_;  // weak
 
-  scoped_nsobject<WindowSizeAutosaver> size_saver_;
+  base::scoped_nsobject<WindowSizeAutosaver> size_saver_;
 
   // These contain a permutation of [0..|model_->ResourceCount() - 1|]. Used to
   // implement sorting.
@@ -39,7 +39,7 @@ class ImageSkia;
   std::vector<int> modelToViewMap_;
 
   // Descriptor of the current sort column.
-  scoped_nsobject<NSSortDescriptor> currentSortDescriptor_;
+  base::scoped_nsobject<NSSortDescriptor> currentSortDescriptor_;
 }
 
 // Creates and shows the task manager's window.