Move scoped_nsdisable_screen_update from base to app/mac...

chrome/browser/geolocation/wifi_data_provider_corewlan_mac.mm

 // Copyright (c) 2010 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 "chrome/browser/geolocation/wifi_data_provider_mac.h"
 
 #include <dlfcn.h>
 #import <Foundation/Foundation.h>
 
-#include "base/scoped_nsautorelease_pool.h"
+#include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/scoped_nsobject.h"
 #include "base/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 36 matching lines @@
   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::ScopedNSAutoreleasePool auto_pool;
+  base::mac::ScopedNSAutoreleasePool auto_pool;
   bundle_.reset([[NSBundle alloc]
       initWithPath:@"/System/Library/Frameworks/CoreWLAN.framework"]);
   if (!bundle_) {
     DLOG(INFO) << "Failed to load the CoreWLAN framework bundle";
     return false;
   }
 
   // Dynamically look up the value of the kCWScanKeyMerge (i.e. without build
   // time dependency on the 10.6 specific library).
   void* dl_handle = dlopen([[bundle_ executablePath] fileSystemRepresentation],
@@ skipping 11 matching lines @@
     // this value is itself wrong it's not the end of the world, we might just
     // get very slightly lower quality location fixes due to SSID merges).
     DLOG(WARNING) << "Could not dynamically load the CoreWLAN merge key";
     merge_key_.reset([@"SCAN_MERGE" retain]);
   }
 
   return true;
 }
 
 bool CoreWlanApi::GetAccessPointData(WifiData::AccessPointDataSet* data) {
-  base::ScopedNSAutoreleasePool auto_pool;
+  base::mac::ScopedNSAutoreleasePool auto_pool;
   // Initialize the scan parameters with scan key merging disabled, so we get
   // every AP listed in the scan without any SSID de-duping logic.
   NSDictionary* params =
       [NSDictionary dictionaryWithObject:[NSNumber numberWithBool:NO]
                                   forKey:merge_key_.get()];
 
   Class cw_interface_class = [bundle_ classNamed:@"CWInterface"];
   NSArray* supported_interfaces = [cw_interface_class supportedInterfaces];
   uint interface_error_count = 0;
   for (NSString* interface_name in supported_interfaces) {
@@ skipping 41 matching lines @@
          [supported_interfaces count] > interface_error_count;
 }
 
 WifiDataProviderCommon::WlanApiInterface* NewCoreWlanApi() {
   scoped_ptr<CoreWlanApi> self(new CoreWlanApi);
   if (self->Init())
     return self.release();
 
   return NULL;
 }