mac: Update clients of scoped_nsobject.h.

remoting/host/continue_window_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/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_;
 }
 
 - (id)initWithUiStrings:(const remoting::UiStrings*)ui_strings
         continue_window:(remoting::ContinueWindow*)continue_window;
 - (void)show;
 - (void)hide;
 - (void)onCancel:(id)sender;
 - (void)onContinue:(id)sender;
 @end
 
 namespace remoting {
 
 // A bridge between C++ and ObjC implementations of ContinueWindow.
 // Everything important occurs in ContinueWindowMacController.
 class ContinueWindowMac : public ContinueWindow {
  public:
   explicit ContinueWindowMac(const UiStrings& ui_strings);
   virtual ~ContinueWindowMac();
 
  protected:
   // ContinueWindow overrides.
   virtual void ShowUi() OVERRIDE;
   virtual void HideUi() OVERRIDE;
 
  private:
-  scoped_nsobject<ContinueWindowMacController> controller_;
+  base::scoped_nsobject<ContinueWindowMacController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(ContinueWindowMac);
 };
 
 ContinueWindowMac::ContinueWindowMac(const UiStrings& ui_strings)
     : ContinueWindow(ui_strings) {
 }
 
 ContinueWindowMac::~ContinueWindowMac() {
   DCHECK(CalledOnValidThread());
@@ skipping 72 matching lines @@
   [continue_button setAction:@selector(onContinue:)];
   [continue_button setTarget:self];
 
   NSButton* cancel_button =
       [continue_alert_ addButtonWithTitle:cancel_button_string];
   [cancel_button setAction:@selector(onCancel:)];
   [cancel_button setTarget:self];
 
   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];
 
   // Force alert to be at the proper level and location.
   NSWindow* continue_window = [continue_alert_ window];
   [continue_window center];
   [continue_window setLevel:NSModalPanelWindowLevel];
   [continue_window orderWindow:NSWindowAbove
                     relativeTo:[[shades_ lastObject] windowNumber]];
@@ skipping 13 matching lines @@
   [self hide];
   continue_window_->DisconnectSession();
 }
 
 - (void)onContinue:(id)sender {
   [self hide];
   continue_window_->ContinueSession();
 }
 
 @end