diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-07-05 23:02:58 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-07-08 17:55:06 +0100 |
| commit | 8474bd350e233cca45dcbfe5f8e4f542675c4c66 (patch) | |
| tree | 22bda6115bff31e1c867f970993988f2d54b6bc9 /android/autofill | |
| parent | a628b56b8b7c7f9a8730b0e43c6e04fcf3619b7e (diff) | |
| download | external_chromium-8474bd350e233cca45dcbfe5f8e4f542675c4c66.zip external_chromium-8474bd350e233cca45dcbfe5f8e4f542675c4c66.tar.gz external_chromium-8474bd350e233cca45dcbfe5f8e4f542675c4c66.tar.bz2 | |
Merge Chromium at r12.0.742.93: Compile fixes from moving url_request_context_getter
Change-Id: I9daca7590633f466d3066e359a3bb8c6d29d6d19
http://codereview.chromium.org/6778025
Diffstat (limited to 'android/autofill')
| -rw-r--r-- | android/autofill/android_url_request_context_getter.h | 4 | ||||
| -rw-r--r-- | android/autofill/url_fetcher_proxy.h | 2 |
2 files changed, 3 insertions, 3 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 |