summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-15 00:21:34 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-15 00:21:34 +0000
commitaeb53f0e2f6352ec7fbc2113270a97072b42c764 (patch)
tree1f4da7884df919c21903a7881964273a9f7496fd /chrome_frame
parentec8962ca7de01eb5685b32a4361dd7be8f7e6293 (diff)
downloadchromium_src-aeb53f0e2f6352ec7fbc2113270a97072b42c764.zip
chromium_src-aeb53f0e2f6352ec7fbc2113270a97072b42c764.tar.gz
chromium_src-aeb53f0e2f6352ec7fbc2113270a97072b42c764.tar.bz2
net: Remove typedef net::URLRequestContext URLRequestContext;
BUG=64263 TEST=compiled locally, trybots Review URL: http://codereview.chromium.org/6338002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71522 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/metrics_service.cc6
-rw-r--r--chrome_frame/test/test_server_test.cc2
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/metrics_service.cc b/chrome_frame/metrics_service.cc
index ebb23cf..d9aea10 100644
--- a/chrome_frame/metrics_service.cc
+++ b/chrome_frame/metrics_service.cc
@@ -133,7 +133,7 @@ extern base::LazyInstance<base::StatisticsRecorder> g_statistics_recorder_;
// This class provides HTTP request context information for metrics upload
// requests initiated by ChromeFrame.
-class ChromeFrameUploadRequestContext : public URLRequestContext {
+class ChromeFrameUploadRequestContext : public net::URLRequestContext {
public:
explicit ChromeFrameUploadRequestContext(MessageLoop* io_loop)
: io_loop_(io_loop) {
@@ -210,7 +210,7 @@ class ChromeFrameUploadRequestContextGetter : public URLRequestContextGetter {
explicit ChromeFrameUploadRequestContextGetter(MessageLoop* io_loop)
: io_loop_(io_loop) {}
- virtual URLRequestContext* GetURLRequestContext() {
+ virtual net::URLRequestContext* GetURLRequestContext() {
if (!context_)
context_ = new ChromeFrameUploadRequestContext(io_loop_);
return context_;
@@ -228,7 +228,7 @@ class ChromeFrameUploadRequestContextGetter : public URLRequestContextGetter {
DVLOG(1) << __FUNCTION__;
}
- scoped_refptr<URLRequestContext> context_;
+ scoped_refptr<net::URLRequestContext> context_;
mutable scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_;
MessageLoop* io_loop_;
};
diff --git a/chrome_frame/test/test_server_test.cc b/chrome_frame/test/test_server_test.cc
index 23073e3e..f273dce 100644
--- a/chrome_frame/test/test_server_test.cc
+++ b/chrome_frame/test/test_server_test.cc
@@ -58,7 +58,7 @@ class ScopedInternet {
HINTERNET h_;
};
-class URLRequestTestContext : public URLRequestContext {
+class URLRequestTestContext : public net::URLRequestContext {
public:
URLRequestTestContext() {
host_resolver_ =