summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-13 01:05:48 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-13 01:05:48 +0000
commit6a394af194527fdc2cdc5b8af5e367dfdb16828e (patch)
tree9bd79d17939b1852cd1d764c94ea30448e77f4cc
parentbe68e3a778a9a3d9bd5c9deeac9e11ea7c94c6de (diff)
downloadchromium_src-6a394af194527fdc2cdc5b8af5e367dfdb16828e.zip
chromium_src-6a394af194527fdc2cdc5b8af5e367dfdb16828e.tar.gz
chromium_src-6a394af194527fdc2cdc5b8af5e367dfdb16828e.tar.bz2
Move URLFetcher from content/common to content/common/net.
Add a OWNERS for content/common/net BUG=none TEST=none Review URL: http://codereview.chromium.org/7875006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100828 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/alternate_nav_url_fetcher.h2
-rw-r--r--chrome/browser/autocomplete/search_provider.h2
-rw-r--r--chrome/browser/autofill/autofill_download.h3
-rw-r--r--chrome/browser/browser_process_impl.cc2
-rw-r--r--chrome/browser/bug_report_util.cc2
-rw-r--r--chrome/browser/component_updater/component_updater_service.cc2
-rw-r--r--chrome/browser/component_updater/component_updater_service_unittest.cc2
-rw-r--r--chrome/browser/extensions/apps_promo.h2
-rw-r--r--chrome/browser/extensions/extension_updater.h2
-rw-r--r--chrome/browser/extensions/webstore_inline_installer.h2
-rw-r--r--chrome/browser/extensions/webstore_install_helper.h2
-rw-r--r--chrome/browser/google/google_url_tracker.h2
-rw-r--r--chrome/browser/google/google_url_tracker_unittest.cc2
-rw-r--r--chrome/browser/importer/toolbar_importer.h2
-rw-r--r--chrome/browser/intranet_redirect_detector.h2
-rw-r--r--chrome/browser/io_thread.cc2
-rw-r--r--chrome/browser/metrics/metrics_service.h2
-rw-r--r--chrome/browser/net/gaia/gaia_oauth_fetcher.cc1
-rw-r--r--chrome/browser/net/gaia/gaia_oauth_fetcher.h2
-rw-r--r--chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc2
-rw-r--r--chrome/browser/net/sdch_dictionary_fetcher.h2
-rw-r--r--chrome/browser/plugin_download_helper.h4
-rw-r--r--chrome/browser/policy/cloud_policy_subsystem_unittest.cc2
-rw-r--r--chrome/browser/policy/device_management_service.h2
-rw-r--r--chrome/browser/policy/testing_policy_url_fetcher_factory.h2
-rw-r--r--chrome/browser/safe_browsing/client_side_detection_service.cc1
-rw-r--r--chrome/browser/safe_browsing/client_side_detection_service.h2
-rw-r--r--chrome/browser/safe_browsing/client_side_detection_service_unittest.cc2
-rw-r--r--chrome/browser/safe_browsing/malware_details_cache.h2
-rw-r--r--chrome/browser/safe_browsing/protocol_manager.h2
-rw-r--r--chrome/browser/search_engines/template_url_fetcher.cc2
-rw-r--r--chrome/browser/spellchecker/spellcheck_host_impl.h2
-rw-r--r--chrome/browser/sync/glue/http_bridge.h2
-rw-r--r--chrome/browser/sync/glue/sync_backend_host_unittest.cc2
-rw-r--r--chrome/browser/sync/test/integration/sync_test.cc2
-rw-r--r--chrome/browser/tab_contents/spelling_menu_observer.h2
-rw-r--r--chrome/browser/translate/translate_manager.h2
-rw-r--r--chrome/browser/web_resource/web_resource_service.cc2
-rw-r--r--chrome/common/net/gaia/gaia_auth_fetcher.h2
-rw-r--r--chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc2
-rw-r--r--chrome/common/net/gaia/gaia_auth_fetcher_unittest.h2
-rw-r--r--chrome/common/net/gaia/gaia_oauth_client_unittest.cc2
-rw-r--r--chrome/service/cloud_print/cloud_print_url_fetcher.h2
-rw-r--r--chrome/service/gaia/service_gaia_authenticator.h3
-rw-r--r--chrome/service/service_process.cc2
-rw-r--r--content/browser/geolocation/network_location_request.h2
-rw-r--r--content/browser/speech/speech_recognition_request.h2
-rw-r--r--content/common/net/OWNERS2
-rw-r--r--content/common/net/url_fetcher.cc (renamed from content/common/url_fetcher.cc)2
-rw-r--r--content/common/net/url_fetcher.h (renamed from content/common/url_fetcher.h)6
-rw-r--r--content/common/net/url_fetcher_unittest.cc (renamed from content/common/url_fetcher_unittest.cc)3
-rw-r--r--content/content_common.gypi4
-rw-r--r--content/content_tests.gypi2
-rw-r--r--content/test/test_url_fetcher_factory.h2
54 files changed, 57 insertions, 60 deletions
diff --git a/chrome/browser/alternate_nav_url_fetcher.h b/chrome/browser/alternate_nav_url_fetcher.h
index 07fdf33..36a9adb 100644
--- a/chrome/browser/alternate_nav_url_fetcher.h
+++ b/chrome/browser/alternate_nav_url_fetcher.h
@@ -12,7 +12,7 @@
#include "chrome/browser/tab_contents/link_infobar_delegate.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
class NavigationController;
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index ebced4e..acdc719 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -26,7 +26,7 @@
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_id.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
class Profile;
diff --git a/chrome/browser/autofill/autofill_download.h b/chrome/browser/autofill/autofill_download.h
index fdb18b5..647ba21 100644
--- a/chrome/browser/autofill/autofill_download.h
+++ b/chrome/browser/autofill/autofill_download.h
@@ -17,7 +17,7 @@
#include "base/memory/scoped_vector.h"
#include "base/time.h"
#include "chrome/browser/autofill/autofill_type.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
class AutofillMetrics;
class FormStructure;
@@ -170,4 +170,3 @@ class AutofillDownloadManager : public URLFetcher::Delegate {
};
#endif // CHROME_BROWSER_AUTOFILL_AUTOFILL_DOWNLOAD_H_
-
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index e2a5544..d605292 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -79,8 +79,8 @@
#include "content/browser/plugin_service.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_service.h"
-#include "content/common/url_fetcher.h"
#include "ipc/ipc_logging.h"
#include "net/socket/client_socket_pool_manager.h"
#include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc
index c79b81c..995d26c 100644
--- a/chrome/browser/bug_report_util.cc
+++ b/chrome/browser/bug_report_util.cc
@@ -22,7 +22,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/common/chrome_version_info.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "grit/generated_resources.h"
#include "grit/locale_settings.h"
diff --git a/chrome/browser/component_updater/component_updater_service.cc b/chrome/browser/component_updater/component_updater_service.cc
index d92516a..8706ac0 100644
--- a/chrome/browser/component_updater/component_updater_service.cc
+++ b/chrome/browser/component_updater/component_updater_service.cc
@@ -24,8 +24,8 @@
#include "chrome/common/chrome_version_info.h"
#include "chrome/common/extensions/extension.h"
#include "content/browser/utility_process_host.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_service.h"
-#include "content/common/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "net/base/escape.h"
#include "net/base/load_flags.h"
diff --git a/chrome/browser/component_updater/component_updater_service_unittest.cc b/chrome/browser/component_updater/component_updater_service_unittest.cc
index c5cd516..a8e2af5 100644
--- a/chrome/browser/component_updater/component_updater_service_unittest.cc
+++ b/chrome/browser/component_updater/component_updater_service_unittest.cc
@@ -15,9 +15,9 @@
#include "chrome/test/base/test_notification_tracker.h"
#include "chrome/test/base/test_url_request_context_getter.h"
#include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_service.h"
-#include "content/common/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "libxml/globals.h"
diff --git a/chrome/browser/extensions/apps_promo.h b/chrome/browser/extensions/apps_promo.h
index 28c5b03..248865a 100644
--- a/chrome/browser/extensions/apps_promo.h
+++ b/chrome/browser/extensions/apps_promo.h
@@ -11,7 +11,7 @@
#include "base/gtest_prod_util.h"
#include "chrome/common/extensions/extension.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
class PrefService;
class Profile;
diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h
index 169756e..bcba5e8 100644
--- a/chrome/browser/extensions/extension_updater.h
+++ b/chrome/browser/extensions/extension_updater.h
@@ -24,7 +24,7 @@
#include "base/timer.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/common/extensions/update_manifest.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
class Extension;
diff --git a/chrome/browser/extensions/webstore_inline_installer.h b/chrome/browser/extensions/webstore_inline_installer.h
index 72ea056..7f11aa8 100644
--- a/chrome/browser/extensions/webstore_inline_installer.h
+++ b/chrome/browser/extensions/webstore_inline_installer.h
@@ -14,7 +14,7 @@
#include "chrome/browser/extensions/extension_install_ui.h"
#include "chrome/browser/extensions/webstore_install_helper.h"
#include "content/browser/tab_contents/tab_contents_observer.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/extensions/webstore_install_helper.h b/chrome/browser/extensions/webstore_install_helper.h
index dd5a931..70d122b 100644
--- a/chrome/browser/extensions/webstore_install_helper.h
+++ b/chrome/browser/extensions/webstore_install_helper.h
@@ -7,7 +7,7 @@
#pragma once
#include "content/browser/utility_process_host.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h
index 9e370ff..d770065 100644
--- a/chrome/browser/google/google_url_tracker.h
+++ b/chrome/browser/google/google_url_tracker.h
@@ -11,9 +11,9 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "net/base/network_change_notifier.h"
diff --git a/chrome/browser/google/google_url_tracker_unittest.cc b/chrome/browser/google/google_url_tracker_unittest.cc
index 5ef262a..0aa1be6 100644
--- a/chrome/browser/google/google_url_tracker_unittest.cc
+++ b/chrome/browser/google/google_url_tracker_unittest.cc
@@ -14,8 +14,8 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_pref_service.h"
#include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_service.h"
-#include "content/common/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "net/url_request/url_request.h"
#include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h
index 0752325..fd1fcf0 100644
--- a/chrome/browser/importer/toolbar_importer.h
+++ b/chrome/browser/importer/toolbar_importer.h
@@ -18,7 +18,7 @@
#include "base/string16.h"
#include "chrome/browser/importer/importer.h"
#include "chrome/browser/importer/profile_writer.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
class ImporterBridge;
class XmlReader;
diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h
index 17080c4..7111eb5 100644
--- a/chrome/browser/intranet_redirect_detector.h
+++ b/chrome/browser/intranet_redirect_detector.h
@@ -12,7 +12,7 @@
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "net/base/host_resolver_proc.h"
#include "net/base/network_change_notifier.h"
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 38474c6..d0f3171 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -32,7 +32,7 @@
#include "content/browser/browser_thread.h"
#include "content/browser/gpu/gpu_process_host.h"
#include "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "net/base/cert_verifier.h"
#include "net/base/cookie_monster.h"
#include "net/base/default_origin_bound_cert_store.h"
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 5d3eb2a..46867ed 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -20,7 +20,7 @@
#include "chrome/common/metrics_helpers.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#if defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/external_metrics.h"
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
index 1aabeef..10c59fb 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
@@ -24,7 +24,6 @@
#include "chrome/common/net/http_return.h"
#include "content/common/notification_details.h"
#include "content/common/notification_source.h"
-#include "content/common/url_fetcher.h"
#include "grit/chromium_strings.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request_context_getter.h"
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.h b/chrome/browser/net/gaia/gaia_oauth_fetcher.h
index d1df1c3..ecc6a4d 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher.h
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.h
@@ -11,9 +11,9 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/net/chrome_cookie_notification_details.h"
#include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/url_fetcher.h"
#include "googleurl/src/gurl.h"
struct ChromeCookieDetails;
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
index d92f41b..5f26ea5 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
@@ -17,8 +17,8 @@
#include "chrome/common/net/gaia/google_service_auth_error.h"
#include "chrome/common/net/http_return.h"
#include "chrome/test/base/testing_profile.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_service.h"
-#include "content/common/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.h b/chrome/browser/net/sdch_dictionary_fetcher.h
index 8ae55c0..1e9643d 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.h
+++ b/chrome/browser/net/sdch_dictionary_fetcher.h
@@ -16,7 +16,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/task.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "net/base/sdch_manager.h"
class SdchDictionaryFetcher : public URLFetcher::Delegate,
diff --git a/chrome/browser/plugin_download_helper.h b/chrome/browser/plugin_download_helper.h
index b640c3b..dcddaa7 100644
--- a/chrome/browser/plugin_download_helper.h
+++ b/chrome/browser/plugin_download_helper.h
@@ -12,7 +12,7 @@
#if defined(OS_WIN)
#include "base/file_path.h"
#include "base/message_loop_proxy.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "net/base/file_stream.h"
#include "net/url_request/url_request.h"
#include "ui/gfx/native_widget_types.h"
@@ -69,5 +69,3 @@ class PluginDownloadUrlHelper : public URLFetcher::Delegate {
#endif // OS_WIN
#endif // CHROME_BROWSER_PLUGIN_DOWNLOAD_HELPER_H_
-
-
diff --git a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
index cd11107..a201baf 100644
--- a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
+++ b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc
@@ -20,7 +20,7 @@
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_pref_service.h"
#include "content/browser/browser_thread.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "policy/policy_constants.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/policy/device_management_service.h b/chrome/browser/policy/device_management_service.h
index 9029ace..5df5223 100644
--- a/chrome/browser/policy/device_management_service.h
+++ b/chrome/browser/policy/device_management_service.h
@@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "chrome/browser/policy/device_management_backend.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
class Profile;
diff --git a/chrome/browser/policy/testing_policy_url_fetcher_factory.h b/chrome/browser/policy/testing_policy_url_fetcher_factory.h
index 2c27145..d109f58 100644
--- a/chrome/browser/policy/testing_policy_url_fetcher_factory.h
+++ b/chrome/browser/policy/testing_policy_url_fetcher_factory.h
@@ -11,7 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/policy/logging_work_scheduler.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "googleurl/src/gurl.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index 6843912..1a7b8f7 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -25,7 +25,6 @@
#include "content/browser/browser_thread.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/common/notification_service.h"
-#include "content/common/url_fetcher.h"
#include "crypto/sha2.h"
#include "googleurl/src/gurl.h"
#include "net/base/load_flags.h"
diff --git a/chrome/browser/safe_browsing/client_side_detection_service.h b/chrome/browser/safe_browsing/client_side_detection_service.h
index 7afe1cd..0a25f8b 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.h
+++ b/chrome/browser/safe_browsing/client_side_detection_service.h
@@ -30,9 +30,9 @@
#include "base/memory/scoped_ptr.h"
#include "base/task.h"
#include "base/time.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_util.h"
diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
index 55c0f0e..09a3716 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
@@ -19,7 +19,7 @@
#include "chrome/common/safe_browsing/csd.pb.h"
#include "chrome/renderer/safe_browsing/features.h"
#include "content/browser/browser_thread.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "crypto/sha2.h"
#include "googleurl/src/gurl.h"
diff --git a/chrome/browser/safe_browsing/malware_details_cache.h b/chrome/browser/safe_browsing/malware_details_cache.h
index 115eb1a..2b1a5ba 100644
--- a/chrome/browser/safe_browsing/malware_details_cache.h
+++ b/chrome/browser/safe_browsing/malware_details_cache.h
@@ -16,7 +16,7 @@
#include "base/memory/linked_ptr.h"
#include "base/memory/ref_counted.h"
#include "chrome/browser/safe_browsing/report.pb.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "net/base/completion_callback.h"
namespace net {
diff --git a/chrome/browser/safe_browsing/protocol_manager.h b/chrome/browser/safe_browsing/protocol_manager.h
index 98b2b1e..d0ff19b 100644
--- a/chrome/browser/safe_browsing/protocol_manager.h
+++ b/chrome/browser/safe_browsing/protocol_manager.h
@@ -25,7 +25,7 @@
#include "chrome/browser/safe_browsing/protocol_parser.h"
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/safe_browsing_util.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
namespace net {
class URLRequestStatus;
diff --git a/chrome/browser/search_engines/template_url_fetcher.cc b/chrome/browser/search_engines/template_url_fetcher.cc
index 718049b..aa86952 100644
--- a/chrome/browser/search_engines/template_url_fetcher.cc
+++ b/chrome/browser/search_engines/template_url_fetcher.cc
@@ -15,10 +15,10 @@
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/search_engines/template_url_parser.h"
#include "chrome/common/chrome_notification_types.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
#include "content/common/notification_source.h"
-#include "content/common/url_fetcher.h"
#include "net/url_request/url_request_status.h"
// RequestDelegate ------------------------------------------------------------
diff --git a/chrome/browser/spellchecker/spellcheck_host_impl.h b/chrome/browser/spellchecker/spellcheck_host_impl.h
index cb99838..6ec5ec4 100644
--- a/chrome/browser/spellchecker/spellcheck_host_impl.h
+++ b/chrome/browser/spellchecker/spellcheck_host_impl.h
@@ -13,9 +13,9 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/spellchecker/spellcheck_host.h"
#include "chrome/browser/spellchecker/spellcheck_profile_provider.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/url_fetcher.h"
// This class implements the SpellCheckHost interface to provide the
// functionalities listed below:
diff --git a/chrome/browser/sync/glue/http_bridge.h b/chrome/browser/sync/glue/http_bridge.h
index b5d8236..7f8fdb2 100644
--- a/chrome/browser/sync/glue/http_bridge.h
+++ b/chrome/browser/sync/glue/http_bridge.h
@@ -15,7 +15,7 @@
#include "base/synchronization/waitable_event.h"
#include "chrome/browser/sync/internal_api/http_post_provider_factory.h"
#include "chrome/browser/sync/internal_api/http_post_provider_interface.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "net/url_request/url_request_context_getter.h"
#include "net/url_request/url_request_context.h"
diff --git a/chrome/browser/sync/glue/sync_backend_host_unittest.cc b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
index a274909..f3d928a 100644
--- a/chrome/browser/sync/glue/sync_backend_host_unittest.cc
+++ b/chrome/browser/sync/glue/sync_backend_host_unittest.cc
@@ -14,7 +14,7 @@
#include "chrome/test/base/testing_profile.h"
#include "chrome/test/base/test_url_request_context_getter.h"
#include "content/browser/browser_thread.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "googleurl/src/gurl.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index b3797d7..de40e1b 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -32,7 +32,7 @@
#include "chrome/test/base/ui_test_utils.h"
#include "content/browser/browser_thread.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "googleurl/src/gurl.h"
#include "net/base/escape.h"
diff --git a/chrome/browser/tab_contents/spelling_menu_observer.h b/chrome/browser/tab_contents/spelling_menu_observer.h
index 60e7a94..4ea7a54 100644
--- a/chrome/browser/tab_contents/spelling_menu_observer.h
+++ b/chrome/browser/tab_contents/spelling_menu_observer.h
@@ -12,7 +12,7 @@
#include "base/string16.h"
#include "base/timer.h"
#include "chrome/browser/tab_contents/render_view_context_menu_observer.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
class GURL;
class RenderViewContextMenuProxy;
diff --git a/chrome/browser/translate/translate_manager.h b/chrome/browser/translate/translate_manager.h
index 7fd73e2..22c6638 100644
--- a/chrome/browser/translate/translate_manager.h
+++ b/chrome/browser/translate/translate_manager.h
@@ -16,9 +16,9 @@
#include "base/task.h"
#include "chrome/browser/prefs/pref_change_registrar.h"
#include "chrome/common/translate_errors.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/url_fetcher.h"
template <typename T> struct DefaultSingletonTraits;
class GURL;
diff --git a/chrome/browser/web_resource/web_resource_service.cc b/chrome/browser/web_resource/web_resource_service.cc
index 371a520..860cf72 100644
--- a/chrome/browser/web_resource/web_resource_service.cc
+++ b/chrome/browser/web_resource/web_resource_service.cc
@@ -21,8 +21,8 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/common/web_resource/web_resource_unpacker.h"
#include "content/browser/browser_thread.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/notification_service.h"
-#include "content/common/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request_status.h"
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher.h b/chrome/common/net/gaia/gaia_auth_fetcher.h
index 1fb471a..e9cbdd3 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher.h
+++ b/chrome/common/net/gaia/gaia_auth_fetcher.h
@@ -11,7 +11,7 @@
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
// Authenticate a user against the Google Accounts ClientLogin API
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
index 42dbe32..8f49ebb 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.cc
@@ -17,7 +17,7 @@
#include "chrome/common/net/gaia/google_service_auth_error.h"
#include "chrome/common/net/http_return.h"
#include "chrome/test/base/testing_profile.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "googleurl/src/gurl.h"
#include "net/base/load_flags.h"
diff --git a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.h b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.h
index 6cea31c..0534c52 100644
--- a/chrome/common/net/gaia/gaia_auth_fetcher_unittest.h
+++ b/chrome/common/net/gaia/gaia_auth_fetcher_unittest.h
@@ -13,7 +13,7 @@
#include "chrome/common/net/gaia/gaia_auth_fetcher.h"
#include "chrome/common/net/http_return.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "net/url_request/url_request_status.h"
diff --git a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
index d204a79..97a859b 100644
--- a/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
+++ b/chrome/common/net/gaia/gaia_oauth_client_unittest.cc
@@ -12,7 +12,7 @@
#include "chrome/common/net/gaia/gaia_oauth_client.h"
#include "chrome/common/net/http_return.h"
#include "chrome/test/base/testing_profile.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "content/test/test_url_fetcher_factory.h"
#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
diff --git a/chrome/service/cloud_print/cloud_print_url_fetcher.h b/chrome/service/cloud_print/cloud_print_url_fetcher.h
index f6f3680..ab49923 100644
--- a/chrome/service/cloud_print/cloud_print_url_fetcher.h
+++ b/chrome/service/cloud_print/cloud_print_url_fetcher.h
@@ -9,7 +9,7 @@
#include <string>
#include "base/memory/scoped_ptr.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
class GURL;
diff --git a/chrome/service/gaia/service_gaia_authenticator.h b/chrome/service/gaia/service_gaia_authenticator.h
index 5076372..fded2d2 100644
--- a/chrome/service/gaia/service_gaia_authenticator.h
+++ b/chrome/service/gaia/service_gaia_authenticator.h
@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/synchronization/waitable_event.h"
#include "chrome/common/net/gaia/gaia_authenticator.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
namespace base {
class MessageLoopProxy;
@@ -56,4 +56,3 @@ class ServiceGaiaAuthenticator
};
#endif // CHROME_SERVICE_GAIA_SERVICE_GAIA_AUTHENTICATOR_H_
-
diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
index 49292ef..e763948 100644
--- a/chrome/service/service_process.cc
+++ b/chrome/service/service_process.cc
@@ -25,7 +25,7 @@
#include "chrome/service/net/service_url_request_context.h"
#include "chrome/service/service_ipc_server.h"
#include "chrome/service/service_process_prefs.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "grit/chromium_strings.h"
#include "grit/generated_resources.h"
#include "net/base/network_change_notifier.h"
diff --git a/content/browser/geolocation/network_location_request.h b/content/browser/geolocation/network_location_request.h
index 0694052..8df175f 100644
--- a/content/browser/geolocation/network_location_request.h
+++ b/content/browser/geolocation/network_location_request.h
@@ -12,7 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "content/browser/geolocation/device_data_provider.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
class URLFetcher;
diff --git a/content/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h
index b6701a1..0c79ed6 100644
--- a/content/browser/speech/speech_recognition_request.h
+++ b/content/browser/speech/speech_recognition_request.h
@@ -11,8 +11,8 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
+#include "content/common/net/url_fetcher.h"
#include "content/common/speech_input_result.h"
-#include "content/common/url_fetcher.h"
#include "googleurl/src/gurl.h"
class URLFetcher;
diff --git a/content/common/net/OWNERS b/content/common/net/OWNERS
new file mode 100644
index 0000000..2f937b5
--- /dev/null
+++ b/content/common/net/OWNERS
@@ -0,0 +1,2 @@
+eroman@chromium.org
+willchan@chromium.org
diff --git a/content/common/url_fetcher.cc b/content/common/net/url_fetcher.cc
index 4493c07..be4d448 100644
--- a/content/common/url_fetcher.cc
+++ b/content/common/net/url_fetcher.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include <set>
diff --git a/content/common/url_fetcher.h b/content/common/net/url_fetcher.h
index b3cee3b..00ff56f 100644
--- a/content/common/url_fetcher.h
+++ b/content/common/net/url_fetcher.h
@@ -11,8 +11,8 @@
// temporary situation. We will work on allowing support for multiple "io"
// threads per process.
-#ifndef CONTENT_COMMON_URL_FETCHER_H_
-#define CONTENT_COMMON_URL_FETCHER_H_
+#ifndef CONTENT_COMMON_NET_URL_FETCHER_H_
+#define CONTENT_COMMON_NET_URL_FETCHER_H_
#pragma once
#include <string>
@@ -320,4 +320,4 @@ class URLFetcher {
DISALLOW_COPY_AND_ASSIGN(URLFetcher);
};
-#endif // CONTENT_COMMON_URL_FETCHER_H_
+#endif // CONTENT_COMMON_NET_URL_FETCHER_H_
diff --git a/content/common/url_fetcher_unittest.cc b/content/common/net/url_fetcher_unittest.cc
index e301fe8..86411d1 100644
--- a/content/common/url_fetcher_unittest.cc
+++ b/content/common/net/url_fetcher_unittest.cc
@@ -2,11 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "content/common/net/url_fetcher.h"
+
#include "base/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
#include "build/build_config.h"
-#include "content/common/url_fetcher.h"
#include "crypto/nss_util.h"
#include "net/http/http_response_headers.h"
#include "net/test/test_server.h"
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 5623da2..2aa7cb7 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -159,6 +159,8 @@
'common/native_web_keyboard_event_win.cc',
'common/navigation_gesture.h',
'common/navigation_types.h',
+ 'common/net/url_fetcher.cc',
+ 'common/net/url_fetcher.h',
'common/notification_details.cc',
'common/notification_details.h',
'common/notification_observer.h',
@@ -236,8 +238,6 @@
'common/unix_domain_socket_posix.h',
'common/url_constants.cc',
'common/url_constants.h',
- 'common/url_fetcher.cc',
- 'common/url_fetcher.h',
'common/utility_messages.h',
'common/view_messages.h',
'common/view_types.cc',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 29e8809..b05062f 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -126,11 +126,11 @@
'common/gpu/gpu_feature_flags_unittest.cc',
'common/gpu/gpu_info_unittest.cc',
'common/hi_res_timer_manager_unittest.cc',
+ 'common/net/url_fetcher_unittest.cc',
'common/notification_service_unittest.cc',
'common/process_watcher_unittest.cc',
'common/property_bag_unittest.cc',
'common/resource_dispatcher_unittest.cc',
- 'common/url_fetcher_unittest.cc',
'gpu/gpu_info_collector_unittest.cc',
'gpu/gpu_info_collector_unittest_win.cc',
'renderer/active_notification_tracker_unittest.cc',
diff --git a/content/test/test_url_fetcher_factory.h b/content/test/test_url_fetcher_factory.h
index a286bad..c003106 100644
--- a/content/test/test_url_fetcher_factory.h
+++ b/content/test/test_url_fetcher_factory.h
@@ -12,7 +12,7 @@
#include <utility>
#include "base/threading/non_thread_safe.h"
-#include "content/common/url_fetcher.h"
+#include "content/common/net/url_fetcher.h"
#include "googleurl/src/gurl.h"
#include "net/url_request/url_request_status.h"