From a533975a8e3bb741948750a68a2c962a48777fe0 Mon Sep 17 00:00:00 2001 From: Kristian Monsen Date: Wed, 25 May 2011 11:49:55 +0100 Subject: Merge chromium to 10.0.634.0: Compile fix base/thread.h moved to base/threading/thread.h: http://codereview.chromium.org/6028009 Change-Id: I4a7dd04055ed931f6bc2c6b63255f3832d0c78bd --- media/libstagefright/chromium_http/support.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media/libstagefright/chromium_http/support.cpp b/media/libstagefright/chromium_http/support.cpp index 3e4e493..805bd48 100644 --- a/media/libstagefright/chromium_http/support.cpp +++ b/media/libstagefright/chromium_http/support.cpp @@ -23,7 +23,7 @@ #include "support.h" #include "android/net/android_network_library_impl.h" -#include "base/thread.h" +#include "base/threading/thread.h" #include "net/base/cert_verifier.h" #include "net/base/host_resolver.h" #include "net/base/ssl_config_service.h" -- cgit v1.1