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) {