Refactor trace_event_impl's SetEnabled to use TraceOptions. Propagate this through the whole stack.

chrome/test/base/tracing.cc

Index: chrome/test/base/tracing.cc
diff --git a/chrome/test/base/tracing.cc b/chrome/test/base/tracing.cc
index 87e6aaa34342a684e1e3775b93c5ccb7320414ce..03a53f1e1d5c025eaded15f8ed2c84b618d29284 100644
--- a/chrome/test/base/tracing.cc
+++ b/chrome/test/base/tracing.cc
@@ -4,6 +4,7 @@
 
 #include "chrome/test/base/tracing.h"
 
+#include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/singleton.h"
@@ -32,7 +33,8 @@ class InProcessTraceController {
   bool BeginTracing(const std::string& category_patterns) {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     return content::TracingController::GetInstance()->EnableRecording(
-        category_patterns, content::TracingController::DEFAULT_OPTIONS,
+        base::debug::CategoryFilter(category_patterns),
+        base::debug::TraceOptions(),
         content::TracingController::EnableRecordingDoneCallback());
   }
 
@@ -50,7 +52,8 @@ class InProcessTraceController {
       return false;
     }
     if (!content::TracingController::GetInstance()->EnableRecording(
-            category_patterns, content::TracingController::DEFAULT_OPTIONS,
+            base::debug::CategoryFilter(category_patterns),
+            base::debug::TraceOptions(),
             base::Bind(&InProcessTraceController::OnEnableTracingComplete,
                        base::Unretained(this)))) {
       return false;