mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/color_chooser_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "chrome/browser/ui/browser_dialogs.h"
 #include "content/public/browser/color_chooser.h"
 #include "content/public/browser/web_contents.h"
 #include "skia/ext/skia_utils_mac.h"
 
 class ColorChooserMac;
 
 // A Listener class to act as a event target for NSColorPanel and send
 // the results to the C++ class, ColorChooserMac.
 @interface ColorPanelCocoa : NSObject<NSWindowDelegate> {
@@ skipping 28 matching lines @@
 
   virtual void End() OVERRIDE;
   virtual void SetSelectedColor(SkColor color) OVERRIDE;
 
  private:
   static ColorChooserMac* current_color_chooser_;
 
   // The web contents invoking the color chooser.  No ownership because it will
   // outlive this class.
   content::WebContents* web_contents_;
-  scoped_nsobject<ColorPanelCocoa> panel_;
+  base::scoped_nsobject<ColorPanelCocoa> panel_;
 };
 
 ColorChooserMac* ColorChooserMac::current_color_chooser_ = NULL;
 
 // static
 ColorChooserMac* ColorChooserMac::Open(content::WebContents* web_contents,
                                        SkColor initial_color) {
   if (current_color_chooser_)
     current_color_chooser_->End();
   DCHECK(!current_color_chooser_);
@@ skipping 84 matching lines @@
 namespace chrome {
 
 content::ColorChooser* ShowColorChooser(content::WebContents* web_contents,
                                         SkColor initial_color) {
   return ColorChooserMac::Open(web_contents, initial_color);
 }
 
 }  // namepace chrome
 
 @end