diff options
Diffstat (limited to 'content/browser/geolocation')
12 files changed, 12 insertions, 12 deletions
diff --git a/content/browser/geolocation/network_location_provider.cc b/content/browser/geolocation/network_location_provider.cc index 8cf98bb..7af2f82 100644 --- a/content/browser/geolocation/network_location_provider.cc +++ b/content/browser/geolocation/network_location_provider.cc @@ -5,8 +5,8 @@ #include "content/browser/geolocation/network_location_provider.h" #include "base/bind.h" +#include "base/strings/utf_string_conversions.h" #include "base/time.h" -#include "base/utf_string_conversions.h" #include "content/public/browser/access_token_store.h" namespace content { diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc index ccbfc1b..b8b49da 100644 --- a/content/browser/geolocation/network_location_provider_unittest.cc +++ b/content/browser/geolocation/network_location_provider_unittest.cc @@ -8,7 +8,7 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/browser/geolocation/fake_access_token_store.h" #include "content/browser/geolocation/location_arbitrator_impl.h" diff --git a/content/browser/geolocation/network_location_request.cc b/content/browser/geolocation/network_location_request.cc index 849381c..8fef967 100644 --- a/content/browser/geolocation/network_location_request.cc +++ b/content/browser/geolocation/network_location_request.cc @@ -11,7 +11,7 @@ #include "base/json/json_writer.h" #include "base/metrics/histogram.h" #include "base/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "content/browser/geolocation/location_arbitrator_impl.h" #include "content/public/common/geoposition.h" diff --git a/content/browser/geolocation/wifi_data_provider_chromeos.cc b/content/browser/geolocation/wifi_data_provider_chromeos.cc index 44fd228..b4222d7 100644 --- a/content/browser/geolocation/wifi_data_provider_chromeos.cc +++ b/content/browser/geolocation/wifi_data_provider_chromeos.cc @@ -7,7 +7,7 @@ #include "content/browser/geolocation/wifi_data_provider_chromeos.h" #include "base/bind.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chromeos/network/geolocation_handler.h" #include "content/public/browser/browser_thread.h" diff --git a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc index 272693f..1cf6e5d 100644 --- a/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_chromeos_unittest.cc @@ -4,7 +4,7 @@ #include "base/message_loop.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/shill_manager_client.h" #include "chromeos/network/geolocation_handler.h" diff --git a/content/browser/geolocation/wifi_data_provider_common.cc b/content/browser/geolocation/wifi_data_provider_common.cc index b00b0a2..2b7f555 100644 --- a/content/browser/geolocation/wifi_data_provider_common.cc +++ b/content/browser/geolocation/wifi_data_provider_common.cc @@ -6,7 +6,7 @@ #include "base/bind.h" #include "base/stringprintf.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" namespace content { diff --git a/content/browser/geolocation/wifi_data_provider_common_unittest.cc b/content/browser/geolocation/wifi_data_provider_common_unittest.cc index 341f392..25b47bf 100644 --- a/content/browser/geolocation/wifi_data_provider_common_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_common_unittest.cc @@ -6,8 +6,8 @@ #include "base/memory/scoped_ptr.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/third_party/dynamic_annotations/dynamic_annotations.h" -#include "base/utf_string_conversions.h" #include "content/browser/geolocation/wifi_data_provider_common.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/content/browser/geolocation/wifi_data_provider_common_win.cc b/content/browser/geolocation/wifi_data_provider_common_win.cc index 929903e..9ac7848 100644 --- a/content/browser/geolocation/wifi_data_provider_common_win.cc +++ b/content/browser/geolocation/wifi_data_provider_common_win.cc @@ -6,7 +6,7 @@ #include <assert.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/browser/geolocation/device_data_provider.h" #include "content/browser/geolocation/wifi_data_provider_common.h" diff --git a/content/browser/geolocation/wifi_data_provider_linux.cc b/content/browser/geolocation/wifi_data_provider_linux.cc index 09a60f3..096258e 100644 --- a/content/browser/geolocation/wifi_data_provider_linux.cc +++ b/content/browser/geolocation/wifi_data_provider_linux.cc @@ -10,7 +10,7 @@ #include "base/memory/scoped_ptr.h" #include "base/string_number_conversions.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_path.h" diff --git a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc index 9a1a99d..a8779b9 100644 --- a/content/browser/geolocation/wifi_data_provider_linux_unittest.cc +++ b/content/browser/geolocation/wifi_data_provider_linux_unittest.cc @@ -7,7 +7,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "dbus/message.h" #include "dbus/mock_bus.h" #include "dbus/mock_object_proxy.h" diff --git a/content/browser/geolocation/wifi_data_provider_mac.cc b/content/browser/geolocation/wifi_data_provider_mac.cc index c72950e..8f81305 100644 --- a/content/browser/geolocation/wifi_data_provider_mac.cc +++ b/content/browser/geolocation/wifi_data_provider_mac.cc @@ -12,7 +12,7 @@ #include <dlfcn.h> #include <stdio.h> -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "content/browser/geolocation/osx_wifi.h" #include "content/browser/geolocation/wifi_data_provider_common.h" diff --git a/content/browser/geolocation/wifi_data_provider_win.cc b/content/browser/geolocation/wifi_data_provider_win.cc index bdf50f3..a35e6e9 100644 --- a/content/browser/geolocation/wifi_data_provider_win.cc +++ b/content/browser/geolocation/wifi_data_provider_win.cc @@ -28,7 +28,7 @@ #include <wlanapi.h> #include "base/metrics/histogram.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "base/win/windows_version.h" #include "content/browser/geolocation/wifi_data_provider_common.h" #include "content/browser/geolocation/wifi_data_provider_common_win.h" |