mac: Update clients of scoped_nsobject.h.

content/browser/geolocation/wifi_data_provider_corewlan_mac.mm

 // Copyright (c) 2011 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.
 
 // Implements a WLAN API binding for CoreWLAN, as available on OSX 10.6
 
 #include "content/browser/geolocation/wifi_data_provider_mac.h"
 
 #include <dlfcn.h>
 #import <Foundation/Foundation.h>
 
 #include "base/mac/scoped_nsautorelease_pool.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/sys_string_conversions.h"
 
 // Define a subset of the CoreWLAN interfaces we require. We can't depend on
 // CoreWLAN.h existing as we need to build on 10.5 SDKs. We can't just send
 // messages to an untyped id due to the build treating warnings as errors,
 // hence the reason we need class definitions.
 // TODO(joth): When we build all 10.6 code exclusively 10.6 SDK (or later)
 // tidy this up to use the framework directly. See http://crbug.com/37703
 
@@ skipping 27 matching lines @@
 
   // Must be called before any other interface method. Will return false if the
   // CoreWLAN framework cannot be initialized (e.g. running on pre-10.6 OSX),
   // in which case no other method may be called.
   bool Init();
 
   // WlanApiInterface
   virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data) OVERRIDE;
 
  private:
-  scoped_nsobject<NSBundle> bundle_;
-  scoped_nsobject<NSString> merge_key_;
+  base::scoped_nsobject<NSBundle> bundle_;
+  base::scoped_nsobject<NSString> merge_key_;
 
   DISALLOW_COPY_AND_ASSIGN(CoreWlanApi);
 };
 
 bool CoreWlanApi::Init() {
   // As the WLAN api binding runs on its own thread, we need to provide our own
   // auto release pool. It's simplest to do this as an automatic variable in
   // each method that needs it, to ensure the scoping is correct and does not
   // interfere with any other code using autorelease pools on the thread.
   base::mac::ScopedNSAutoreleasePool auto_pool;
@@ skipping 105 matching lines @@
 
 WifiDataProviderCommon::WlanApiInterface* NewCoreWlanApi() {
   scoped_ptr<CoreWlanApi> self(new CoreWlanApi);
   if (self->Init())
     return self.release();
 
   return NULL;
 }
 
 }  // namespace content