diff options
author | Kristian Monsen <kristianm@google.com> | 2011-06-14 20:57:57 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-14 20:57:57 -0700 |
commit | 30d71a05aaffadd0da1ff3c715a46dab5b645645 (patch) | |
tree | 8653438184a0dae1ed943d3fcc4c3a0bd08847f5 /media | |
parent | 7f8d2a63e05cfe2d132ea0db482c9727673ccdd4 (diff) | |
parent | 7c37c1cf37a423db732000a007b196327627ea1c (diff) | |
download | frameworks_base-30d71a05aaffadd0da1ff3c715a46dab5b645645.zip frameworks_base-30d71a05aaffadd0da1ff3c715a46dab5b645645.tar.gz frameworks_base-30d71a05aaffadd0da1ff3c715a46dab5b645645.tar.bz2 |
Merge "Merge chromium to r11.0.672.0: Compile fix"
Diffstat (limited to 'media')
-rw-r--r-- | media/libstagefright/chromium_http/support.cpp | 6 | ||||
-rw-r--r-- | media/libstagefright/chromium_http/support.h | 2 |
2 files changed, 4 insertions, 4 deletions
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 @@ namespace android { 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::OnSetCookie( } 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 @@ void SfDelegate::readMore(net::URLRequest *request) { } 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()); 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 @@ private: DISALLOW_EVIL_CONSTRUCTORS(SfNetLog); }; -struct SfRequestContext : public URLRequestContext { +struct SfRequestContext : public net::URLRequestContext { SfRequestContext(); virtual const std::string &GetUserAgent(const GURL &url) const; |