Revert 237280 "Remove TraceController"

trunk/src/content/browser/devtools/devtools_tracing_handler.h

Index: trunk/src/content/browser/devtools/devtools_tracing_handler.h
===================================================================
--- trunk/src/content/browser/devtools/devtools_tracing_handler.h	(revision 237451)
+++ trunk/src/content/browser/devtools/devtools_tracing_handler.h	(working copy)
@@ -5,36 +5,36 @@
 #ifndef CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_TRACING_HANDLER_H_
 #define CONTENT_BROWSER_DEVTOOLS_DEVTOOLS_TRACING_HANDLER_H_
 
-#include "base/memory/weak_ptr.h"
+#include "base/debug/trace_event.h"
 #include "content/browser/devtools/devtools_protocol.h"
-#include "content/public/browser/tracing_controller.h"
+#include "content/public/browser/trace_subscriber.h"
 
-namespace base {
-class RefCountedString;
-}
-
 namespace content {
 
 // This class bridges DevTools remote debugging server with the trace
 // infrastructure.
-class DevToolsTracingHandler : public DevToolsProtocol::Handler {
+class DevToolsTracingHandler
+    : public TraceSubscriber,
+      public DevToolsProtocol::Handler {
  public:
   DevToolsTracingHandler();
   virtual ~DevToolsTracingHandler();
 
+  // TraceSubscriber:
+  virtual void OnEndTracingComplete() OVERRIDE;;
+  virtual void OnTraceDataCollected(
+      const scoped_refptr<base::RefCountedString>& trace_fragment) OVERRIDE;
+
  private:
-  void BeginReadingRecordingResult(const base::FilePath& path);
-  void ReadRecordingResult(const scoped_refptr<base::RefCountedString>& result);
-  void OnTraceDataCollected(const std::string& trace_fragment);
-
   scoped_refptr<DevToolsProtocol::Response> OnStart(
       scoped_refptr<DevToolsProtocol::Command> command);
   scoped_refptr<DevToolsProtocol::Response> OnEnd(
       scoped_refptr<DevToolsProtocol::Command> command);
 
-  TracingController::Options TraceOptionsFromString(const std::string& options);
+  base::debug::TraceLog::Options TraceOptionsFromString(
+      const std::string& options);
 
-  base::WeakPtrFactory<DevToolsTracingHandler> weak_factory_;
+  bool is_running_;
 
   DISALLOW_COPY_AND_ASSIGN(DevToolsTracingHandler);
 };