Merge Chromium at r12.0.742.93: Compile fixes from moving url_request_context_getter

Change-Id: I9daca7590633f466d3066e359a3bb8c6d29d6d19
http://codereview.chromium.org/6778025

5 files changed, 6 insertions, 6 deletions

diff --git a/android/autofill/android_url_request_context_getter.h b/android/autofill/android_url_request_context_getter.h
index 2c3e79b..4c34081 100644
--- a/android/autofill/android_url_request_context_getter.h
+++ b/android/autofill/android_url_request_context_getter.h
@@ -28,10 +28,10 @@
 
 #include "base/message_loop_proxy.h"
 #include "base/threading/thread.h"
-#include "common/net/url_request_context_getter.h"
+#include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_context.h"
 
-class AndroidURLRequestContextGetter : public URLRequestContextGetter {
+class AndroidURLRequestContextGetter : public net::URLRequestContextGetter {
 public:
   AndroidURLRequestContextGetter(net::URLRequestContext* context, base::Thread* ioThread)
     : context_(context)
diff --git a/android/autofill/url_fetcher_proxy.h b/android/autofill/url_fetcher_proxy.h
index 9ea2951..954125f 100644
--- a/android/autofill/url_fetcher_proxy.h
+++ b/android/autofill/url_fetcher_proxy.h
@@ -98,7 +98,7 @@ public:
 
   virtual void Start()
   {
-    scoped_refptr<URLRequestContextGetter> con = request_context();
+    scoped_refptr<net::URLRequestContextGetter> con = request_context();
     CHECK(con.get()) << "No URLRequestContextGetter!";
     scoped_refptr<base::MessageLoopProxy> mlp = con->GetIOMessageLoopProxy();
     // TODO: See the template specialisation at the top of the file. Can we use
diff --git a/android/content/browser/tab_contents/tab_contents.h b/android/content/browser/tab_contents/tab_contents.h
index 009cbc8..a9ca9ba 100644
--- a/android/content/browser/tab_contents/tab_contents.h
+++ b/android/content/browser/tab_contents/tab_contents.h
@@ -28,7 +28,7 @@ public:
   }
 
   Profile* profile() { return profile_.get(); }
-  void SetProfileRequestContext(URLRequestContextGetter* context) { static_cast<ProfileImplAndroid*>(profile_.get())->SetRequestContext(context); }
+  void SetProfileRequestContext(net::URLRequestContextGetter* context) { static_cast<ProfileImplAndroid*>(profile_.get())->SetRequestContext(context); }
   AutoFillHost* autofill_host() { return autofill_host_; }
   void SetAutoFillHost(AutoFillHost* autofill_host) { autofill_host_ = autofill_host; }
 
diff --git a/chrome/common/net/url_fetcher.cc b/chrome/common/net/url_fetcher.cc
index 18878d2..995fbe1 100644
--- a/chrome/common/net/url_fetcher.cc
+++ b/chrome/common/net/url_fetcher.cc
@@ -565,7 +565,7 @@ void URLFetcher::set_request_context(
 }
 
 #ifdef ANDROID
-URLRequestContextGetter* URLFetcher::request_context() {
+net::URLRequestContextGetter* URLFetcher::request_context() {
     return core_->request_context_getter_;
 }
 #endif
diff --git a/chrome/common/net/url_fetcher.h b/chrome/common/net/url_fetcher.h
index 3b9d93b..73f4a2c 100644
--- a/chrome/common/net/url_fetcher.h
+++ b/chrome/common/net/url_fetcher.h
@@ -171,7 +171,7 @@ class URLFetcher {
       net::URLRequestContextGetter* request_context_getter);
 
 #ifdef ANDROID
-  URLRequestContextGetter* request_context();
+  net::URLRequestContextGetter* request_context();
 #endif
 
   // If |retry| is false, 5xx responses will be propagated to the observer,