diff options
Diffstat (limited to 'chrome/browser/extensions')
12 files changed, 11 insertions, 12 deletions
diff --git a/chrome/browser/extensions/extension_event_router_forwarder.h b/chrome/browser/extensions/extension_event_router_forwarder.h index 8011291..49e5681 100644 --- a/chrome/browser/extensions/extension_event_router_forwarder.h +++ b/chrome/browser/extensions/extension_event_router_forwarder.h @@ -10,7 +10,6 @@ #include "base/basictypes.h" #include "base/ref_counted.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile.h" #include "content/browser/browser_thread.h" diff --git a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc b/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc index 8bc2f9c..5962dd5 100644 --- a/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc +++ b/chrome/browser/extensions/extension_event_router_forwarder_unittest.cc @@ -5,11 +5,11 @@ #include "chrome/browser/extensions/extension_event_router_forwarder.h" #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/test/testing_browser_process.h" #include "chrome/test/testing_profile.h" #include "chrome/test/thread_test_helper.h" +#include "content/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/extension_icon_manager_unittest.cc b/chrome/browser/extensions/extension_icon_manager_unittest.cc index d3c476b..0a4189c 100644 --- a/chrome/browser/extensions/extension_icon_manager_unittest.cc +++ b/chrome/browser/extensions/extension_icon_manager_unittest.cc @@ -5,12 +5,12 @@ #include "base/message_loop.h" #include "base/path_service.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_icon_manager.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/json_value_serializer.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/skia_util.h" diff --git a/chrome/browser/extensions/extension_info_map_unittest.cc b/chrome/browser/extensions/extension_info_map_unittest.cc index d4892d1..ba5a0b2 100644 --- a/chrome/browser/extensions/extension_info_map_unittest.cc +++ b/chrome/browser/extensions/extension_info_map_unittest.cc @@ -4,11 +4,11 @@ #include "base/message_loop.h" #include "base/path_service.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_info_map.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/json_value_serializer.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace keys = extension_manifest_keys; diff --git a/chrome/browser/extensions/extension_menu_manager_unittest.cc b/chrome/browser/extensions/extension_menu_manager_unittest.cc index ca844cc..b3d089e 100644 --- a/chrome/browser/extensions/extension_menu_manager_unittest.cc +++ b/chrome/browser/extensions/extension_menu_manager_unittest.cc @@ -10,7 +10,6 @@ #include "base/scoped_vector.h" #include "base/utf_string_conversions.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_event_router.h" #include "chrome/browser/extensions/extension_menu_manager.h" #include "chrome/browser/extensions/test_extension_prefs.h" @@ -19,6 +18,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/notification_service.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" #include "webkit/glue/context_menu.h" diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h index 8ca7b28..1f29f0c 100644 --- a/chrome/browser/extensions/extension_service_unittest.h +++ b/chrome/browser/extensions/extension_service_unittest.h @@ -11,8 +11,8 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/scoped_temp_dir.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_service.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class ExtensionServiceTestBase : public testing::Test { diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc index 0fb7119..067bd86 100644 --- a/chrome/browser/extensions/extension_updater_unittest.cc +++ b/chrome/browser/extensions/extension_updater_unittest.cc @@ -13,7 +13,6 @@ #include "base/stringprintf.h" #include "base/threading/thread.h" #include "base/version.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_error_reporter.h" #include "chrome/browser/extensions/extension_updater.h" #include "chrome/browser/extensions/extension_service.h" @@ -24,6 +23,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/net/test_url_fetcher_factory.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" diff --git a/chrome/browser/extensions/external_policy_extension_loader_unittest.cc b/chrome/browser/extensions/external_policy_extension_loader_unittest.cc index 3e01e12..74ec31f 100644 --- a/chrome/browser/extensions/external_policy_extension_loader_unittest.cc +++ b/chrome/browser/extensions/external_policy_extension_loader_unittest.cc @@ -8,7 +8,6 @@ #include "base/message_loop.h" #include "base/values.h" #include "base/version.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/external_extension_provider_interface.h" #include "chrome/browser/extensions/external_extension_provider_impl.h" #include "chrome/browser/extensions/external_policy_extension_loader.h" @@ -16,6 +15,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/testing_pref_service.h" #include "chrome/test/testing_profile.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" class ExternalPolicyExtensionProviderTest : public testing::Test { diff --git a/chrome/browser/extensions/file_reader_unittest.cc b/chrome/browser/extensions/file_reader_unittest.cc index 8119db6..5b50588 100644 --- a/chrome/browser/extensions/file_reader_unittest.cc +++ b/chrome/browser/extensions/file_reader_unittest.cc @@ -7,11 +7,11 @@ #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/file_reader.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_resource.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/extensions/image_loading_tracker_unittest.cc b/chrome/browser/extensions/image_loading_tracker_unittest.cc index b0516ad..4e41d32 100644 --- a/chrome/browser/extensions/image_loading_tracker_unittest.cc +++ b/chrome/browser/extensions/image_loading_tracker_unittest.cc @@ -4,7 +4,6 @@ #include "base/message_loop.h" #include "base/path_service.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/image_loading_tracker.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" @@ -13,6 +12,7 @@ #include "chrome/common/json_value_serializer.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/size.h" diff --git a/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc index 43c7f76..3dc8d26 100644 --- a/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc +++ b/chrome/browser/extensions/key_identifier_conversion_views_unittest.cc @@ -7,7 +7,7 @@ #include "base/basictypes.h" #include "base/logging.h" #include "base/message_loop.h" -#include "chrome/browser/browser_thread.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc index c88fffb..0975f27 100644 --- a/chrome/browser/extensions/test_extension_prefs.cc +++ b/chrome/browser/extensions/test_extension_prefs.cc @@ -9,7 +9,6 @@ #include "base/message_loop_proxy.h" #include "base/scoped_ptr.h" #include "base/values.h" -#include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_pref_store.h" #include "chrome/browser/extensions/extension_pref_value_map.h" #include "chrome/browser/extensions/extension_prefs.h" @@ -19,6 +18,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/json_pref_store.h" +#include "content/browser/browser_thread.h" #include "testing/gtest/include/gtest/gtest.h" namespace { |