From 9c7e521a0bd94b62fffc1b1374dd743e20cd01bd Mon Sep 17 00:00:00 2001
From: Kristian Monsen <kristianm@google.com>
Date: Thu, 2 Jun 2011 13:18:38 +0100
Subject: Merge Chromium at r11.0.672.0: Compile fix in
 android_url_request_context_getter.*

Typedef removed in this CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924

Change-Id: I3ed7374ea725269edd68eae7094e74df37ce7be3
---
 android/autofill/android_url_request_context_getter.cc | 2 +-
 android/autofill/android_url_request_context_getter.h  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'android')

diff --git a/android/autofill/android_url_request_context_getter.cc b/android/autofill/android_url_request_context_getter.cc
index 4dcf971..60f99d1 100644
--- a/android/autofill/android_url_request_context_getter.cc
+++ b/android/autofill/android_url_request_context_getter.cc
@@ -26,7 +26,7 @@
 
 #include "android_url_request_context_getter.h"
 
-URLRequestContext* AndroidURLRequestContextGetter::GetURLRequestContext()
+net::URLRequestContext* AndroidURLRequestContextGetter::GetURLRequestContext()
 {
   return context_.get();
 }
diff --git a/android/autofill/android_url_request_context_getter.h b/android/autofill/android_url_request_context_getter.h
index d47f792..2c3e79b 100644
--- a/android/autofill/android_url_request_context_getter.h
+++ b/android/autofill/android_url_request_context_getter.h
@@ -33,7 +33,7 @@
 
 class AndroidURLRequestContextGetter : public URLRequestContextGetter {
 public:
-  AndroidURLRequestContextGetter(URLRequestContext* context, base::Thread* ioThread)
+  AndroidURLRequestContextGetter(net::URLRequestContext* context, base::Thread* ioThread)
     : context_(context)
     , io_thread_(ioThread)
   {
@@ -42,11 +42,11 @@ public:
   virtual ~AndroidURLRequestContextGetter() { }
 
   // URLRequestContextGetter implementation
-  virtual URLRequestContext* GetURLRequestContext();
+  virtual net::URLRequestContext* GetURLRequestContext();
   virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const;
 
 private:
-  scoped_refptr<URLRequestContext> context_;
+  scoped_refptr<net::URLRequestContext> context_;
   mutable base::Thread* io_thread_;
 };
 
-- 
cgit v1.1