diff options
author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 04:20:34 +0000 |
---|---|---|
committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-13 04:20:34 +0000 |
commit | ffd7d7365317669d36edaaec4c49b1c0842a1dfc (patch) | |
tree | 601295d96c696fc524774e4f204c9ce6c85dc70c /content | |
parent | 5bfeb5683378809d5fae8c008e1ebf02076299c9 (diff) | |
download | chromium_src-ffd7d7365317669d36edaaec4c49b1c0842a1dfc.zip chromium_src-ffd7d7365317669d36edaaec4c49b1c0842a1dfc.tar.gz chromium_src-ffd7d7365317669d36edaaec4c49b1c0842a1dfc.tar.bz2 |
Move URLFetcher from content/common to content/common/net.
Add a OWNERS for content/common/net
BUG=none
TEST=none
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=100828
Review URL: http://codereview.chromium.org/7875006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100857 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r-- | content/browser/geolocation/network_location_request.h | 2 | ||||
-rw-r--r-- | content/browser/speech/speech_recognition_request.h | 2 | ||||
-rw-r--r-- | content/common/net/OWNERS | 2 | ||||
-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.gypi | 4 | ||||
-rw-r--r-- | content/content_tests.gypi | 2 | ||||
-rw-r--r-- | content/test/test_url_fetcher_factory.h | 2 |
9 files changed, 14 insertions, 11 deletions
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" |