summaryrefslogtreecommitdiffstats
path: root/chrome/browser/io_thread.cc
diff options
context:
space:
mode:
authorsanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-31 18:49:34 +0000
committersanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-31 18:49:34 +0000
commitabe2c035dd58c29f9c5f00807e502baa2cc462bc (patch)
tree45c383ddc14968e16e050938f73456e13a3fe980 /chrome/browser/io_thread.cc
parent6cfef4d1548e36ecff926bdb148d9d497de4176c (diff)
downloadchromium_src-abe2c035dd58c29f9c5f00807e502baa2cc462bc.zip
chromium_src-abe2c035dd58c29f9c5f00807e502baa2cc462bc.tar.gz
chromium_src-abe2c035dd58c29f9c5f00807e502baa2cc462bc.tar.bz2
Moved URLRequestContextGetter to net/ so it can be used by projects such as jingle.
BUG=None TEST=Build. Review URL: http://codereview.chromium.org/6778025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
-rw-r--r--chrome/browser/io_thread.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index f73a5f2..f5f6811 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -236,12 +236,12 @@ ConstructSystemRequestContext(IOThread::Globals* globals,
} // namespace
-class SystemURLRequestContextGetter : public URLRequestContextGetter {
+class SystemURLRequestContextGetter : public net::URLRequestContextGetter {
public:
explicit SystemURLRequestContextGetter(IOThread* io_thread);
virtual ~SystemURLRequestContextGetter();
- // Implementation for UrlRequestContextGetter.
+ // Implementation for net::UrlRequestContextGetter.
virtual net::URLRequestContext* GetURLRequestContext();
virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const;
@@ -378,7 +378,7 @@ void IOThread::ChangedToOnTheRecord() {
&IOThread::ChangedToOnTheRecordOnIOThread));
}
-URLRequestContextGetter* IOThread::system_url_request_context_getter() {
+net::URLRequestContextGetter* IOThread::system_url_request_context_getter() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (!system_url_request_context_getter_) {
system_proxy_config_service_.reset(