commit 64125da2f3b76f2d88bb757cb6bf5bd5e29a0639
author Kristian Monsen <kristianm@google.com> Tue Jun 07 16:05:16 2011 +0100
committer Kristian Monsen <kristianm@google.com> Tue Jun 07 16:09:33 2011 +0100
tree 821fd142d6e0abc77db28176ff295252a9e429b0
parent 65580f9adf6c4d98449ad0716488f9fe3869aa5a

Merge chromium to r11.0.672.0: Compile fix

Cause by upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924

Change-Id: Iada1639b7a38cee963644437e8e3f4f5708d6136

media/libstagefright/chromium_http/support.cpp

diff --git a/media/libstagefright/chromium_http/support.cpp b/media/libstagefright/chromium_http/support.cpp
index 805bd48..ed6846c 100644
--- a/media/libstagefright/chromium_http/support.cpp
+++ b/media/libstagefright/chromium_http/support.cpp
@@ -40,7 +40,7 @@
 
 static Mutex gNetworkThreadLock;
 static base::Thread *gNetworkThread = NULL;
-static scoped_refptr<URLRequestContext> gReqContext;
+static scoped_refptr<net::URLRequestContext> gReqContext;
 
 static void InitializeNetworkThreadIfNecessary() {
     Mutex::Autolock autoLock(gNetworkThreadLock);
@@ -214,7 +214,7 @@
 }
 
 void SfDelegate::OnResponseStarted(net::URLRequest *request) {
-    if (request->status().status() != URLRequestStatus::SUCCESS) {
+    if (request->status().status() != net::URLRequestStatus::SUCCESS) {
         MY_LOGI(StringPrintf(
                     "Request failed with status %d and os_error %d",
                     request->status().status(),
@@ -325,7 +325,7 @@
         } else {
             MY_LOGV("readMore pending read");
 
-            if (request->status().status() != URLRequestStatus::IO_PENDING) {
+            if (request->status().status() != net::URLRequestStatus::IO_PENDING) {
                 MY_LOGI(StringPrintf(
                             "Direct read failed w/ status %d\n",
                             request->status().status()).c_str());

media/libstagefright/chromium_http/support.h

diff --git a/media/libstagefright/chromium_http/support.h b/media/libstagefright/chromium_http/support.h
index 4d03493..8fe8db1 100644
--- a/media/libstagefright/chromium_http/support.h
+++ b/media/libstagefright/chromium_http/support.h
@@ -50,7 +50,7 @@
     DISALLOW_EVIL_CONSTRUCTORS(SfNetLog);
 };
 
-struct SfRequestContext : public URLRequestContext {
+struct SfRequestContext : public net::URLRequestContext {
     SfRequestContext();
 
     virtual const std::string &GetUserAgent(const GURL &url) const;