Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1028)

Unified Diff: content/browser/android/tracing_controller_android.cc

Issue 892213004: Mechanical rename of base::debug -> base::trace_event for /content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part3_1
Patch Set: Rebase. Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/browser/browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/android/tracing_controller_android.cc
diff --git a/content/browser/android/tracing_controller_android.cc b/content/browser/android/tracing_controller_android.cc
index bd11672f58a8c2aea294d6f08d72afbf64815b98..6953a0de5f85015cb0334cb5d0287a3ba9031130 100644
--- a/content/browser/android/tracing_controller_android.cc
+++ b/content/browser/android/tracing_controller_android.cc
@@ -35,7 +35,7 @@ bool TracingControllerAndroid::StartTracing(JNIEnv* env,
jstring jtraceoptions) {
std::string categories =
base::android::ConvertJavaStringToUTF8(env, jcategories);
- base::debug::TraceOptions trace_options;
+ base::trace_event::TraceOptions trace_options;
trace_options.SetFromString(
base::android::ConvertJavaStringToUTF8(env, jtraceoptions));
@@ -43,7 +43,7 @@ bool TracingControllerAndroid::StartTracing(JNIEnv* env,
LOG(WARNING) << "Logging performance trace to file";
return TracingController::GetInstance()->EnableRecording(
- base::debug::CategoryFilter(categories),
+ base::trace_event::CategoryFilter(categories),
trace_options,
TracingController::EnableRecordingDoneCallback());
}
@@ -105,8 +105,10 @@ void TracingControllerAndroid::OnKnownCategoriesReceived(
}
static jstring GetDefaultCategories(JNIEnv* env, jobject obj) {
- return base::android::ConvertUTF8ToJavaString(env,
- base::debug::CategoryFilter::kDefaultCategoryFilterString).Release();
+ return base::android::ConvertUTF8ToJavaString(
+ env,
+ base::trace_event::CategoryFilter::kDefaultCategoryFilterString)
+ .Release();
}
bool RegisterTracingControllerAndroid(JNIEnv* env) {
« no previous file with comments | « content/app/content_main_runner.cc ('k') | content/browser/browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698