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

2 files changed, 3 insertions, 3 deletions

diff --git a/ui/gl/gl_context_nsview.h b/ui/gl/gl_context_nsview.h
index f4f4df7..5f90738 100644
--- a/ui/gl/gl_context_nsview.h
+++ b/ui/gl/gl_context_nsview.h
@@ -8,7 +8,7 @@
 #import <AppKit/NSOpenGL.h>
 
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "ui/gl/gl_context.h"
 
 namespace gfx {
@@ -36,7 +36,7 @@ class GLContextNSView : public GLContextReal {
   void FlushBuffer();
 
  private:
-  scoped_nsobject<NSOpenGLContext> context_;
+  base::scoped_nsobject<NSOpenGLContext> context_;
   GpuPreference gpu_preference_;
 
   DISALLOW_COPY_AND_ASSIGN(GLContextNSView);
diff --git a/ui/gl/gl_context_nsview.mm b/ui/gl/gl_context_nsview.mm
index 464ca3e..b6146bb 100644
--- a/ui/gl/gl_context_nsview.mm
+++ b/ui/gl/gl_context_nsview.mm
@@ -32,7 +32,7 @@ bool GLContextNSView::Initialize(GLSurface* surface,
   attributes.push_back(NSOpenGLPFADoubleBuffer);
   attributes.push_back(0);
 
-  scoped_nsobject<NSOpenGLPixelFormat> pixel_format;
+  base::scoped_nsobject<NSOpenGLPixelFormat> pixel_format;
   pixel_format.reset([[NSOpenGLPixelFormat alloc]
                          initWithAttributes:&attributes.front()]);
   if (!pixel_format) {