Revert 237280 "Remove TraceController"

trunk/src/content/browser/tracing/tracing_ui.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/tracing/tracing_ui.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 68 matching lines @@
   }
 
   int tracing_options = 0;
   if (use_system_tracing)
     tracing_options |= TracingController::ENABLE_SYSTRACE;
   if (use_sampling)
     tracing_options |= TracingController::ENABLE_SAMPLING;
   if (use_continuous_tracing)
     tracing_options |= TracingController::RECORD_CONTINUOUSLY;
 
+  base::debug::CategoryFilter category_filter(category_filter_string);
   return TracingController::GetInstance()->EnableRecording(
-      category_filter_string,
+      category_filter,
       static_cast<TracingController::Options>(tracing_options),
-      base::Bind(&OnRecordingEnabledAck, callback));
+      base::Bind(OnRecordingEnabledAck, callback));
 }
 
 void OnRecordingEnabledAck(const WebUIDataSource::GotDataCallback& callback) {
   base::RefCountedString* res = new base::RefCountedString();
   callback.Run(res);
 }
 
 void OnTraceBufferPercentFullResult(
     const WebUIDataSource::GotDataCallback& callback, float result) {
   std::string str = base::DoubleToString(result);
@@ skipping 58 matching lines @@
 
   WebUIDataSource* source = WebUIDataSource::Create(kChromeUITracingHost);
   source->SetJsonPath("strings.js");
   source->SetDefaultResource(IDR_TRACING_HTML);
   source->AddResourcePath("tracing.js", IDR_TRACING_JS);
   source->SetRequestFilter(base::Bind(OnBeginRequest));
   WebUIDataSource::Add(browser_context, source);
 }
 
 }  // namespace content