Convert string16 to base::string16 in content.

content/browser/geolocation/wifi_data_provider_win.cc

 // 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.
 
 // Windows Vista uses the Native Wifi (WLAN) API for accessing WiFi cards. See
 // http://msdn.microsoft.com/en-us/library/ms705945(VS.85).aspx. Windows XP
 // Service Pack 3 (and Windows XP Service Pack 2, if upgraded with a hot fix)
 // also support a limited version of the WLAN API. See
 // http://msdn.microsoft.com/en-us/library/bb204766.aspx. The WLAN API uses
 // wlanapi.h, which is not part of the SDK used by Gears, so is replicated
@@ skipping 109 matching lines @@
 class WindowsNdisApi : public WifiDataProviderCommon::WlanApiInterface {
  public:
   virtual ~WindowsNdisApi();
   static WindowsNdisApi* Create();
 
   // WlanApiInterface
   virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data);
 
  private:
   static bool GetInterfacesNDIS(
-      std::vector<string16>* interface_service_names_out);
+      std::vector<base::string16>* interface_service_names_out);
 
   // Swaps in content of the vector passed
-  explicit WindowsNdisApi(std::vector<string16>* interface_service_names);
+  explicit WindowsNdisApi(std::vector<base::string16>* interface_service_names);
 
   bool GetInterfaceDataNDIS(HANDLE adapter_handle,
                             WifiData::AccessPointDataSet* data);
   // NDIS variables.
-  std::vector<string16> interface_service_names_;
+  std::vector<base::string16> interface_service_names_;
 
   // Remembers scan result buffer size across calls.
   int oid_buffer_size_;
 };
 
 // Extracts data for an access point and converts to Gears format.
 bool GetNetworkData(const WLAN_BSS_ENTRY& bss_entry,
                     AccessPointData* access_point_data);
-bool UndefineDosDevice(const string16& device_name);
-bool DefineDosDeviceIfNotExists(const string16& device_name);
-HANDLE GetFileHandle(const string16& device_name);
+bool UndefineDosDevice(const base::string16& device_name);
+bool DefineDosDeviceIfNotExists(const base::string16& device_name);
+HANDLE GetFileHandle(const base::string16& device_name);
 // Makes the OID query and returns a Win32 error code.
 int PerformQuery(HANDLE adapter_handle,
                  BYTE* buffer,
                  DWORD buffer_size,
                  DWORD* bytes_out);
 bool ResizeBuffer(int requested_size, scoped_ptr_malloc<BYTE>* buffer);
 // Gets the system directory and appends a trailing slash if not already
 // present.
-bool GetSystemDirectory(string16* path);
+bool GetSystemDirectory(base::string16* path);
 }  // namespace
 
 WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
   return new Win32WifiDataProvider();
 }
 
 Win32WifiDataProvider::Win32WifiDataProvider() {
 }
 
 Win32WifiDataProvider::~Win32WifiDataProvider() {
@@ skipping 26 matching lines @@
 }
 
 WindowsWlanApi::~WindowsWlanApi() {
   FreeLibrary(library_);
 }
 
 WindowsWlanApi* WindowsWlanApi::Create() {
   if (base::win::GetVersion() < base::win::VERSION_VISTA)
     return NULL;
   // We use an absolute path to load the DLL to avoid DLL preloading attacks.
-  string16 system_directory;
+  base::string16 system_directory;
   if (!GetSystemDirectory(&system_directory)) {
     return NULL;
   }
   DCHECK(!system_directory.empty());
-  string16 dll_path = system_directory + L"wlanapi.dll";
+  base::string16 dll_path = system_directory + L"wlanapi.dll";
   HINSTANCE library = LoadLibraryEx(dll_path.c_str(),
                                     NULL,
                                     LOAD_WITH_ALTERED_SEARCH_PATH);
   if (!library) {
     return NULL;
   }
   return new WindowsWlanApi(library);
 }
 
 void WindowsWlanApi::GetWLANFunctions(HINSTANCE wlan_library) {
@@ skipping 131 matching lines @@
     }
   }
 
   (*WlanFreeMemory_function_)(bss_list);
 
   return found;
 }
 
 // WindowsNdisApi
 WindowsNdisApi::WindowsNdisApi(
-    std::vector<string16>* interface_service_names)
+    std::vector<base::string16>* interface_service_names)
     : oid_buffer_size_(kInitialBufferSize) {
   DCHECK(!interface_service_names->empty());
   interface_service_names_.swap(*interface_service_names);
 }
 
 WindowsNdisApi::~WindowsNdisApi() {
 }
 
 WindowsNdisApi* WindowsNdisApi::Create() {
-  std::vector<string16> interface_service_names;
+  std::vector<base::string16> interface_service_names;
   if (GetInterfacesNDIS(&interface_service_names)) {
     return new WindowsNdisApi(&interface_service_names);
   }
   return NULL;
 }
 
 bool WindowsNdisApi::GetAccessPointData(WifiData::AccessPointDataSet* data) {
   DCHECK(data);
   int interfaces_failed = 0;
   int interfaces_succeeded = 0;
@@ skipping 22 matching lines @@
     CloseHandle(adapter_handle);
     UndefineDosDevice(interface_service_names_[i]);
   }
 
   // Return true if at least one interface succeeded, or at the very least none
   // failed.
   return interfaces_succeeded > 0 || interfaces_failed == 0;
 }
 
 bool WindowsNdisApi::GetInterfacesNDIS(
-    std::vector<string16>* interface_service_names_out) {
+    std::vector<base::string16>* interface_service_names_out) {
   HKEY network_cards_key = NULL;
   if (RegOpenKeyEx(
       HKEY_LOCAL_MACHINE,
       L"Software\\Microsoft\\Windows NT\\CurrentVersion\\NetworkCards",
       0,
       KEY_READ,
       &network_cards_key) != ERROR_SUCCESS) {
     return false;
   }
   DCHECK(network_cards_key);
@@ skipping 97 matching lines @@
   UTF8ToUTF16(reinterpret_cast<const char*>(bss_entry.dot11Ssid.ucSSID),
               static_cast<ULONG>(bss_entry.dot11Ssid.uSSIDLength),
               &access_point_data->ssid);
   // TODO(steveblock): Is it possible to get the following?
   // access_point_data->signal_to_noise
   // access_point_data->age
   // access_point_data->channel
   return true;
 }
 
-bool UndefineDosDevice(const string16& device_name) {
+bool UndefineDosDevice(const base::string16& device_name) {
   // We remove only the mapping we use, that is \Device\<device_name>.
-  string16 target_path = L"\\Device\\" + device_name;
+  base::string16 target_path = L"\\Device\\" + device_name;
   return DefineDosDevice(
       DDD_RAW_TARGET_PATH | DDD_REMOVE_DEFINITION | DDD_EXACT_MATCH_ON_REMOVE,
       device_name.c_str(),
       target_path.c_str()) == TRUE;
 }
 
-bool DefineDosDeviceIfNotExists(const string16& device_name) {
+bool DefineDosDeviceIfNotExists(const base::string16& device_name) {
   // We create a DOS device name for the device at \Device\<device_name>.
-  string16 target_path = L"\\Device\\" + device_name;
+  base::string16 target_path = L"\\Device\\" + device_name;
 
   TCHAR target[kStringLength];
   if (QueryDosDevice(device_name.c_str(), target, kStringLength) > 0 &&
       target_path.compare(target) == 0) {
     // Device already exists.
     return true;
   }
 
   if (GetLastError() != ERROR_FILE_NOT_FOUND) {
     return false;
   }
 
   if (!DefineDosDevice(DDD_RAW_TARGET_PATH,
                        device_name.c_str(),
                        target_path.c_str())) {
     return false;
   }
 
   // Check that the device is really there.
   return QueryDosDevice(device_name.c_str(), target, kStringLength) > 0 &&
       target_path.compare(target) == 0;
 }
 
-HANDLE GetFileHandle(const string16& device_name) {
+HANDLE GetFileHandle(const base::string16& device_name) {
   // We access a device with DOS path \Device\<device_name> at
   // \\.\<device_name>.
-  string16 formatted_device_name = L"\\\\.\\" + device_name;
+  base::string16 formatted_device_name = L"\\\\.\\" + device_name;
 
   return CreateFile(formatted_device_name.c_str(),
                     GENERIC_READ,
                     FILE_SHARE_READ | FILE_SHARE_WRITE,  // share mode
                     0,  // security attributes
                     OPEN_EXISTING,
                     0,  // flags and attributes
                     INVALID_HANDLE_VALUE);
 }
 
@@ skipping 21 matching lines @@
   if (requested_size > kMaximumBufferSize) {
     buffer->reset();
     return false;
   }
 
   buffer->reset(reinterpret_cast<BYTE*>(
       realloc(buffer->release(), requested_size)));
   return buffer != NULL;
 }
 
-bool GetSystemDirectory(string16* path) {
+bool GetSystemDirectory(base::string16* path) {
   DCHECK(path);
   // Return value includes terminating NULL.
   int buffer_size = ::GetSystemDirectory(NULL, 0);
   if (buffer_size == 0) {
     return false;
   }
   scoped_ptr<char16[]> buffer(new char16[buffer_size]);
 
   // Return value excludes terminating NULL.
   int characters_written = ::GetSystemDirectory(buffer.get(), buffer_size);
   if (characters_written == 0) {
     return false;
   }
   DCHECK_EQ(buffer_size - 1, characters_written);
 
   path->assign(buffer.get(), characters_written);
 
   if (*path->rbegin() != L'\\') {
     path->append(L"\\");
   }
   DCHECK_EQ(L'\\', *path->rbegin());
   return true;
 }
 }  // namespace
 
 }  // namespace content