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..fe552cfd5b6cee90db1e5a491a80d85be95040da 100644 |
--- a/content/browser/android/tracing_controller_android.cc |
+++ b/content/browser/android/tracing_controller_android.cc |
@@ -9,7 +9,7 @@ |
#include "base/debug/trace_event.h" |
#include "base/json/json_writer.h" |
#include "base/logging.h" |
-#include "content/public/browser/tracing_controller.h" |
+#include "content/browser/tracing/tracing_controller_impl.h" |
#include "jni/TracingControllerAndroid_jni.h" |
namespace content { |
@@ -54,11 +54,11 @@ 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()))) { |
+ TracingControllerImpl::CreateFileSink(file_path, |
+ base::Bind(&TracingControllerAndroid::OnTracingStopped, |
+ weak_factory_.GetWeakPtr())))) { |
LOG(ERROR) << "EndTracingAsync failed, forcing an immediate stop"; |
- OnTracingStopped(file_path); |
+ OnTracingStopped(); |
} |
} |
@@ -71,8 +71,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()) |