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

content/browser/devtools/devtools_tracing_handler.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/devtools/devtools_tracing_handler.h"
 
 #include <cmath>
 
 #include "base/bind.h"
 #include "base/callback.h"
+#include "base/debug/trace_event_impl.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "base/values.h"
@@ skipping 88 matching lines @@
   // Hand-craft protocol notification message so we can substitute JSON
   // that we already got as string as a bare object, not a quoted string.
   std::string message = base::StringPrintf(
       "{ \"method\": \"%s\", \"params\": { \"%s\": [ %s ] } }",
       devtools::Tracing::dataCollected::kName,
       devtools::Tracing::dataCollected::kParamValue,
       trace_fragment.c_str());
   SendRawMessage(message);
 }
 
-TracingController::Options DevToolsTracingHandler::TraceOptionsFromString(
+base::debug::TraceOptions DevToolsTracingHandler::TraceOptionsFromString(
     const std::string& options) {
   std::vector<std::string> split;
   std::vector<std::string>::iterator iter;
-  int ret = 0;
+  base::debug::TraceOptions ret;
 
   base::SplitString(options, ',', &split);
   for (iter = split.begin(); iter != split.end(); ++iter) {
     if (*iter == kRecordUntilFull) {
-      ret &= ~TracingController::RECORD_CONTINUOUSLY;
+      ret.record_mode = base::debug::RECORD_UNTIL_FULL;
     } else if (*iter == kRecordContinuously) {
-      ret |= TracingController::RECORD_CONTINUOUSLY;
+      ret.record_mode = base::debug::RECORD_CONTINUOUSLY;
     } else if (*iter == kEnableSampling) {
-      ret |= TracingController::ENABLE_SAMPLING;
+      ret.enable_sampling = true;

[dsinclair, 2014/07/30 14:25:26]

Should we add systrace here as well?

[nednguyen, 2014/07/30 16:51:15]

I would leave this to another patch since it's a devtool API extension.

     }
   }
-  return static_cast<TracingController::Options>(ret);
+  return ret;
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 DevToolsTracingHandler::OnStart(
     scoped_refptr<DevToolsProtocol::Command> command) {
   is_recording_ = true;
   std::string categories;
   base::DictionaryValue* params = command->params();
   if (params)
     params->GetString(devtools::Tracing::start::kParamCategories, &categories);
 
-  TracingController::Options options = TracingController::DEFAULT_OPTIONS;
+  base::debug::TraceOptions options;
   if (params && params->HasKey(devtools::Tracing::start::kParamOptions)) {
     std::string options_param;
     params->GetString(devtools::Tracing::start::kParamOptions, &options_param);
     options = TraceOptionsFromString(options_param);
   }
 
   if (params && params->HasKey(
       devtools::Tracing::start::kParamBufferUsageReportingInterval)) {
     double usage_reporting_interval = 0.0;
     params->GetDouble(
@@ skipping 12 matching lines @@
                          weak_factory_.GetWeakPtr())),
           true));
       buffer_usage_poll_timer_->Reset();
     }
   }
 
   // If inspected target is a render process Tracing.start will be handled by
   // tracing agent in the renderer.
   if (target_ == Renderer) {
     TracingController::GetInstance()->EnableRecording(
-        categories, options, TracingController::EnableRecordingDoneCallback());
+        base::debug::CategoryFilter(categories),

[dsinclair, 2014/07/30 14:25:26]

unrelated?

[nednguyen, 2014/07/30 16:51:15]

ditto

+        options,
+        TracingController::EnableRecordingDoneCallback());
     return NULL;
   }
 
   TracingController::GetInstance()->EnableRecording(
-      categories, options,
+      base::debug::CategoryFilter(categories),

[dsinclair, 2014/07/30 14:25:26]

Unrelated?

[nednguyen, 2014/07/30 16:51:15]

ditto

+      options,
       base::Bind(&DevToolsTracingHandler::OnTracingStarted,
                  weak_factory_.GetWeakPtr(),
                  command));
 
   return command->AsyncResponsePromise();
 }
 
 void DevToolsTracingHandler::OnTracingStarted(
     scoped_refptr<DevToolsProtocol::Command> command) {
   SendAsyncResponse(command->SuccessResponse(NULL));
@@ skipping 46 matching lines @@
        it != category_set.end(); ++it) {
     category_list->AppendString(*it);
   }
 
   response->Set(devtools::Tracing::getCategories::kResponseCategories,
                 category_list);
   SendAsyncResponse(command->SuccessResponse(response));
 }
 
 }  // namespace content