mac: Update clients of scoped_nsobject.h.

content/browser/geolocation/wifi_data_provider_corewlan_mac.mm

Index: content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
diff --git a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
index ab4a729fc44c1c19beb736177850e7ba8659dc70..81930e08f361097b461669a78c26fe4ec5738c66 100644
--- a/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
+++ b/content/browser/geolocation/wifi_data_provider_corewlan_mac.mm
@@ -10,7 +10,7 @@
 #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"
 
@@ -58,8 +58,8 @@ class CoreWlanApi : public WifiDataProviderCommon::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);
 };