[Startup Tracing] Hook up TraceConfig and remove CategoryFilter & TraceOptions

components/feedback/tracing_manager.cc

 // Copyright 2014 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 "components/feedback/tracing_manager.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "components/feedback/feedback_util.h"
@@ skipping 72 matching lines @@
     // If the trace has already been requested, provide an empty string.
     if (!trace_callback_.is_null()) {
       trace_callback_.Run(scoped_refptr<base::RefCountedString>());
       trace_callback_.Reset();
     }
   }
 }
 
 void TracingManager::StartTracing() {
   content::TracingController::GetInstance()->EnableRecording(
-      base::trace_event::CategoryFilter(),
-      base::trace_event::TraceOptions(),
+      base::trace_event::TraceConfig(),
       content::TracingController::EnableRecordingDoneCallback());
 }
 
 void TracingManager::OnTraceDataCollected(base::RefCountedString* trace_data) {
   if (!current_trace_id_)
     return;
 
   std::string output_val;
   feedback_util::ZipString(
       base::FilePath(kTracingFilename), trace_data->data(), &output_val);
@@ skipping 21 matching lines @@
 // static
 scoped_ptr<TracingManager> TracingManager::Create() {
   if (g_tracing_manager)
     return scoped_ptr<TracingManager>();
   return scoped_ptr<TracingManager>(new TracingManager());
 }
 
 TracingManager* TracingManager::Get() {
   return g_tracing_manager;
 }