diff options
author | Kristian Monsen <kristianm@google.com> | 2011-06-07 16:05:16 +0100 |
---|---|---|
committer | Kristian Monsen <kristianm@google.com> | 2011-06-07 16:09:33 +0100 |
commit | 64125da2f3b76f2d88bb757cb6bf5bd5e29a0639 (patch) | |
tree | 821fd142d6e0abc77db28176ff295252a9e429b0 /media/libstagefright/chromium_http/support.h | |
parent | 65580f9adf6c4d98449ad0716488f9fe3869aa5a (diff) | |
download | frameworks_av-64125da2f3b76f2d88bb757cb6bf5bd5e29a0639.zip frameworks_av-64125da2f3b76f2d88bb757cb6bf5bd5e29a0639.tar.gz frameworks_av-64125da2f3b76f2d88bb757cb6bf5bd5e29a0639.tar.bz2 |
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
Diffstat (limited to 'media/libstagefright/chromium_http/support.h')
-rw-r--r-- | media/libstagefright/chromium_http/support.h | 2 |
1 files changed, 1 insertions, 1 deletions
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; |