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 | fce442c23e65fa1973947df683eec9a5c36057a5 (patch) | |
| tree | ddceac0300d4737abecc48797414312c85c6d629 /media/libstagefright/chromium_http | |
| parent | 7b92cb6aecba28927ed5d66ec1ba0a9f496477f0 (diff) | |
| parent | 64125da2f3b76f2d88bb757cb6bf5bd5e29a0639 (diff) | |
| download | frameworks_av-fce442c23e65fa1973947df683eec9a5c36057a5.zip frameworks_av-fce442c23e65fa1973947df683eec9a5c36057a5.tar.gz frameworks_av-fce442c23e65fa1973947df683eec9a5c36057a5.tar.bz2 | |
Merge "Merge chromium to r11.0.672.0: Compile fix"
Diffstat (limited to 'media/libstagefright/chromium_http')
| -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; |