From 3c2e575fac3d905e47b9bf87b1481439734fe59b Mon Sep 17 00:00:00 2001 From: Viet-Trung Luu Date: Thu, 11 Jun 2015 10:01:25 -0700 Subject: [PATCH] Update from https://crrev.com/333737 * Cherrypick crrev.com/333293 (freetype -> freetype-android). * Update mojo/go/go.py to use android-16 (NDK API level 16), which is 4.1 (first Jelly Bean). Chromium dropped support for 14. * TODO (separately): also update tools/go/upload.py and upload new binaries? * Roll android_tools (to match Chromium). * Small fixes to match //base changes: base::ObserverList, TraceConfig, ThreadTicks, etc. * Restore build/ls.py (and add it to the list of files to not roll). * Remove the dependency on third_party/instrumented_libraries. * Add "enable_topchrome_md = false" to build/config/ui.gni. * Add build/config/ui.gni to files_not_to_roll in update_from_chromium.py. (We should probably get rid of the use_glib variable/argument, and others as well.) * Remove mojo/tools/roll/{roll_network_service.py, roll_network_service_patches/network_service.patch}. These are for rolling from Chromium, whereas we now have/use monet. * Roll buildtools (to match Chromium). * Modify sanitizer gn/gni files to make it work (patch included). (Maybe the patch even works -- I haven't checked.) TBR=rockot@chromium.org,jamesr@chromium.org,rogulenko@google.com Review URL: https://codereview.chromium.org/1180693002. --- services/platform/url_request_types.cc | 4 ++-- shell/android/tracing_controller.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/services/platform/url_request_types.cc b/services/platform/url_request_types.cc index 367577b2c3c..8191d866d83 100644 --- a/services/platform/url_request_types.cc +++ b/services/platform/url_request_types.cc @@ -25,10 +25,10 @@ class HeaderFlattener : public blink::WebHTTPHeaderVisitor { // Skip over referrer headers found in the header map because we already // pulled it out as a separate parameter. - if (LowerCaseEqualsASCII(name_latin1, "referer")) + if (base::LowerCaseEqualsASCII(name_latin1, "referer")) return; - if (LowerCaseEqualsASCII(name_latin1, "accept")) + if (base::LowerCaseEqualsASCII(name_latin1, "accept")) has_accept_header_ = true; auto header = HttpHeader::New(); diff --git a/shell/android/tracing_controller.cc b/shell/android/tracing_controller.cc index ba2abdd5d2f..d9b55c51edc 100644 --- a/shell/android/tracing_controller.cc +++ b/shell/android/tracing_controller.cc @@ -8,6 +8,7 @@ #include "base/android/jni_string.h" #include "base/files/file_util.h" #include "base/macros.h" +#include "base/trace_event/trace_config.h" #include "base/trace_event/trace_event.h" #include "jni/TracingController_jni.h" @@ -45,9 +46,8 @@ static void StartTracing(JNIEnv* env, jclass clazz) { LOG(INFO) << "Starting trace"; base::trace_event::TraceLog::GetInstance()->SetEnabled( - base::trace_event::CategoryFilter("*"), - base::trace_event::TraceLog::RECORDING_MODE, - base::trace_event::TraceOptions(base::trace_event::RECORD_UNTIL_FULL)); + base::trace_event::TraceConfig("*", base::trace_event::RECORD_UNTIL_FULL), + base::trace_event::TraceLog::RECORDING_MODE); } static void StopTracing(JNIEnv* env, jclass clazz, jstring path) {