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

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

Issue 541763002: tracing: get rid of files in TracingController interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed system trace collection Created 6 years, 3 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/browser/android/tracing_controller_android.h ('k') | content/browser/browser_main_loop.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 42f4b0cb12b2d0c20909b3f4e616df7d3c7386be..4c40bb742975ab4a25e2e00f1d610d924151b745 100644
--- a/content/browser/android/tracing_controller_android.cc
+++ b/content/browser/android/tracing_controller_android.cc
@@ -54,11 +54,12 @@ void TracingControllerAndroid::StopTracing(JNIEnv* env,
base::FilePath file_path(
base::android::ConvertJavaStringToUTF8(env, jfilepath));
if (!TracingController::GetInstance()->DisableRecording(
- file_path,
- base::Bind(&TracingControllerAndroid::OnTracingStopped,
- weak_factory_.GetWeakPtr()))) {
+ TracingController::CreateFileSink(
+ file_path,
+ base::Bind(&TracingControllerAndroid::OnTracingStopped,
+ weak_factory_.GetWeakPtr())))) {
LOG(ERROR) << "EndTracingAsync failed, forcing an immediate stop";
- OnTracingStopped(file_path);
+ OnTracingStopped();
}
}
@@ -71,8 +72,7 @@ void TracingControllerAndroid::GenerateTracingFilePath(
base::android::ConvertJavaStringToUTF8(env, jfilename.obj()));
}
-void TracingControllerAndroid::OnTracingStopped(
- const base::FilePath& file_path) {
+void TracingControllerAndroid::OnTracingStopped() {
JNIEnv* env = base::android::AttachCurrentThread();
base::android::ScopedJavaLocalRef<jobject> obj = weak_java_object_.get(env);
if (obj.obj())
« no previous file with comments | « content/browser/android/tracing_controller_android.h ('k') | content/browser/browser_main_loop.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698