Reapply "Remove TraceController"

This reverts https://codereview.chromium.org/101543004/ which was created when
suspected the reason of failure of telemetry tests, but turned out not the real
reason. Reapply.

Reapply the following change:

> Revert "Revert 237280 "Remove TraceController""
>
> This reverts commit 6aa58b8599840160df945afa89e7482d14d1c4d4.
>
> Fixed double-close issue when ending recording.
>
> > Revert 237280 "Remove TraceController"
> >
> > Seems to have broken trace-based telemetry benchmarks on android.
> >
> > BUG=323749
> >
> > > Remove TraceController
> > >
> > > TraceController is obsoleted by TracingController.
> > > Changed all remaining clients to use TracingController.
> > >
> > > BUG=none
> > >
> > > Review URL: https://codereview.chromium.org/67683003
> >
> > TBR=wangxianzhu@chromium.org
> >
> > Review URL: https://codereview.chromium.org/89753004
> >
> > git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237452 0039d316-1c4b-4281-b951-d872f2087c98
>
> TBR=wangxianzhu@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=238234

TBR=

Review URL: https://codereview.chromium.org/102003003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238442 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 5 deletions

diff --git a/content/browser/android/tracing_controller_android.h b/content/browser/android/tracing_controller_android.h
index 0cd310e..4d70e7b 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);
 };