Revert "Revert 237280 "Remove TraceController""

content/browser/android/tracing_controller_android.h

Index: content/browser/android/tracing_controller_android.h
diff --git a/content/browser/android/tracing_controller_android.h b/content/browser/android/tracing_controller_android.h
index 0cd310ebb68ff8364607b8ff62f1284f5114161d..4d70e7b75ef912a557bebf61af854d23c3fbec6c 100644
--- a/content/browser/android/tracing_controller_android.h
+++ b/content/browser/android/tracing_controller_android.h
@@ -6,7 +6,8 @@
 #define CONTENT_BROWSER_ANDROID_TRACING_CONTROLLER_ANDROID_H_
 
 #include "base/android/jni_helper.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/files/file_path.h"
+#include "base/memory/weak_ptr.h"
 
 namespace content {
 
@@ -25,12 +26,11 @@ class TracingControllerAndroid {
 
  private:
   ~TracingControllerAndroid();
-  void OnTracingStopped();
+  void OnTracingStopped(const base::FilePath& file_path);
 
   JavaObjectWeakGlobalRef weak_java_object_;
-
-  class Subscriber;
-  scoped_ptr<Subscriber> subscriber_;
+  base::FilePath file_path_;
+  base::WeakPtrFactory<TracingControllerAndroid> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(TracingControllerAndroid);
 };