diff options
Diffstat (limited to 'chrome/browser/geolocation')
6 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/geolocation/access_token_store_browsertest.cc b/chrome/browser/geolocation/access_token_store_browsertest.cc index c6792c5..ce38af0 100644 --- a/chrome/browser/geolocation/access_token_store_browsertest.cc +++ b/chrome/browser/geolocation/access_token_store_browsertest.cc @@ -9,7 +9,7 @@ #include "chrome/browser/geolocation/chrome_access_token_store.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/browser_thread.h" +#include "content/test/test_browser_thread.h" namespace { diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc index 702e0dd..3f4b1f0 100644 --- a/chrome/browser/geolocation/chrome_access_token_store.cc +++ b/chrome/browser/geolocation/chrome_access_token_store.cc @@ -12,7 +12,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" namespace { diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc index a9c98d2..c3569e0 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.cc @@ -22,10 +22,10 @@ #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" -#include "content/browser/browser_thread.h" #include "content/browser/geolocation/geolocation_provider.h" #include "content/browser/renderer_host/render_view_host.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/notification_types.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index ac3788b..b89c993 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -14,18 +14,18 @@ #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" +#include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/geolocation/arbitrator_dependency_factories_for_test.h" #include "content/browser/geolocation/location_arbitrator.h" #include "content/browser/geolocation/location_provider.h" #include "content/browser/geolocation/mock_location_provider.h" #include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/tab_contents/test_tab_contents.h" -#include "chrome/common/chrome_notification_types.h" #include "content/common/geolocation_messages.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" // ClosedDelegateTracker ------------------------------------------------------ @@ -126,7 +126,7 @@ class GeolocationPermissionContextTests : public TabContentsWrapperTestHarness { virtual void SetUp(); virtual void TearDown(); - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; scoped_refptr<GeolocationArbitratorDependencyFactory> dependency_factory_; }; diff --git a/chrome/browser/geolocation/geolocation_settings_state_unittest.cc b/chrome/browser/geolocation/geolocation_settings_state_unittest.cc index 38feb7b..79bcc88 100644 --- a/chrome/browser/geolocation/geolocation_settings_state_unittest.cc +++ b/chrome/browser/geolocation/geolocation_settings_state_unittest.cc @@ -7,9 +7,9 @@ #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/geolocation/geolocation_settings_state.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread.h" #include "content/browser/tab_contents/navigation_details.h" #include "content/browser/tab_contents/navigation_entry.h" +#include "content/test/test_browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { @@ -22,7 +22,7 @@ class GeolocationSettingsStateTests : public testing::Test { protected: MessageLoop message_loop_; - BrowserThread ui_thread_; + content::TestBrowserThread ui_thread_; }; TEST_F(GeolocationSettingsStateTests, ClearOnNewOrigin) { diff --git a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc index 3abb2d9..13f11d3 100644 --- a/chrome/browser/geolocation/wifi_data_provider_chromeos.cc +++ b/chrome/browser/geolocation/wifi_data_provider_chromeos.cc @@ -10,7 +10,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/network_library.h" -#include "content/browser/browser_thread.h" +#include "content/public/browser/browser_thread.h" namespace { // The time periods between successive polls of the wifi data. |