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, 5 insertions, 5 deletions

diff --git a/remoting/host/continue_window_mac.mm b/remoting/host/continue_window_mac.mm
index c8d3a8a..5ab2bdb 100644
--- a/remoting/host/continue_window_mac.mm
+++ b/remoting/host/continue_window_mac.mm
@@ -7,15 +7,15 @@
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "remoting/host/continue_window.h"
 
 // Handles the ContinueWindow.
 @interface ContinueWindowMacController : NSObject {
  @private
-  scoped_nsobject<NSMutableArray> shades_;
-  scoped_nsobject<NSAlert> continue_alert_;
+  base::scoped_nsobject<NSMutableArray> shades_;
+  base::scoped_nsobject<NSAlert> continue_alert_;
   remoting::ContinueWindow* continue_window_;
   const remoting::UiStrings* ui_strings_;
 }
@@ -43,7 +43,7 @@ class ContinueWindowMac : public ContinueWindow {
   virtual void HideUi() OVERRIDE;
 
  private:
-  scoped_nsobject<ContinueWindowMacController> controller_;
+  base::scoped_nsobject<ContinueWindowMacController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ContinueWindowMac);
 };
@@ -136,7 +136,7 @@ scoped_ptr<HostWindow> HostWindow::CreateContinueWindow(
 
   NSBundle *bundle = [NSBundle bundleForClass:[self class]];
   NSString *imagePath = [bundle pathForResource:@"chromoting128" ofType:@"png"];
-  scoped_nsobject<NSImage> image(
+  base::scoped_nsobject<NSImage> image(
       [[NSImage alloc] initByReferencingFile:imagePath]);
   [continue_alert_ setIcon:image];
   [continue_alert_ layout];