DevTools: disallow to start stop tracing using console.timeline/timelineEnd

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"
@@ skipping 130 matching lines @@
     } else if (*iter == kEnableSampling) {
       ret.enable_sampling = true;
     }
   }
   return ret;
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 DevToolsTracingHandler::OnStart(
     scoped_refptr<DevToolsProtocol::Command> command) {
-  // If inspected target is a render process Tracing.start will be handled by
-  // tracing agent in the renderer.
-  if (target_ == Renderer)
-    return NULL;
-
+  if (is_recording_) {
+    return command->InternalErrorResponse("Tracing is already started.");

[caseq, 2014/09/15 11:38:17]

nit: we don't use terminating punctuation in protocol errors.

[yurys, 2014/09/15 12:02:18]

Done.

+  }
   is_recording_ = true;
 
   std::string categories;
   base::debug::TraceOptions options;
   double usage_reporting_interval = 0.0;
 
   base::DictionaryValue* params = command->params();
   if (params) {
     params->GetString(devtools::Tracing::start::kParamCategories, &categories);
     std::string options_param;
     if (params->GetString(devtools::Tracing::start::kParamOptions,
                           &options_param)) {
       options = TraceOptionsFromString(options_param);
     }
     params->GetDouble(
         devtools::Tracing::start::kParamBufferUsageReportingInterval,
         &usage_reporting_interval);
   }
 
   SetupTimer(usage_reporting_interval);
 
+  // If inspected target is a render process Tracing.start will be handled by
+  // tracing agent in the renderer.
+  if (target_ == Renderer) {
+    TracingController::GetInstance()->EnableRecording(
+        base::debug::CategoryFilter(categories),
+        options,
+        TracingController::EnableRecordingDoneCallback());
+    return NULL;
+  }
+
   TracingController::GetInstance()->EnableRecording(
       base::debug::CategoryFilter(categories),
       options,
       base::Bind(&DevToolsTracingHandler::OnRecordingEnabled,
                  weak_factory_.GetWeakPtr(),
                  command));
   return command->AsyncResponsePromise();
 }
 
 void DevToolsTracingHandler::SetupTimer(double usage_reporting_interval) {
@@ skipping 23 matching lines @@
 
 void DevToolsTracingHandler::OnBufferUsage(float usage) {
   base::DictionaryValue* params = new base::DictionaryValue();
   params->SetDouble(devtools::Tracing::bufferUsage::kParamValue, usage);
   SendNotification(devtools::Tracing::bufferUsage::kName, params);
 }
 
 scoped_refptr<DevToolsProtocol::Response>
 DevToolsTracingHandler::OnEnd(
     scoped_refptr<DevToolsProtocol::Command> command) {
+  if (!is_recording_) {
+    return command->InternalErrorResponse("Tracing is not started.");

[caseq, 2014/09/15 11:38:17]

ditto.

[yurys, 2014/09/15 12:02:18]

Done.

+  }
+  DisableRecording(
+      base::Bind(&DevToolsTracingHandler::BeginReadingRecordingResult,

[caseq, 2014/09/15 11:38:17]

You'll need to rebaseline this against r294801.

[yurys, 2014/09/15 12:02:17]

Done.

+                 weak_factory_.GetWeakPtr()));
   // If inspected target is a render process Tracing.end will be handled by
   // tracing agent in the renderer.
   if (target_ == Renderer)
     return NULL;
-  DisableRecording(
-      base::Bind(&DevToolsTracingHandler::BeginReadingRecordingResult,
-                 weak_factory_.GetWeakPtr()));
   return command->SuccessResponse(NULL);
 }
 
 void DevToolsTracingHandler::DisableRecording(
     const TracingController::TracingFileResultCallback& callback) {
   is_recording_ = false;
   buffer_usage_poll_timer_.reset();
   TracingController::GetInstance()->DisableRecording(base::FilePath(),
                                                      callback);
 }
@@ skipping 21 matching lines @@
   for (std::set<std::string>::const_iterator it = category_set.begin();
        it != category_set.end(); ++it) {
     category_list->AppendString(*it);
   }
 
   response->Set(devtools::Tracing::getCategories::kResponseCategories,
                 category_list);
   SendAsyncResponse(command->SuccessResponse(response));
 }
 
-void DevToolsTracingHandler::EnableTracing(const std::string& category_filter) {
-  if (is_recording_)
-    return;
-  is_recording_ = true;
-
-  SetupTimer(kDefaultReportingInterval);
-
-  TracingController::GetInstance()->EnableRecording(
-      base::debug::CategoryFilter(category_filter),
-      base::debug::TraceOptions(),
-      TracingController::EnableRecordingDoneCallback());
-  SendNotification(devtools::Tracing::started::kName, NULL);
-}
-
-void DevToolsTracingHandler::DisableTracing() {
-  if (!is_recording_)
-    return;
-  is_recording_ = false;
-  DisableRecording(
-      base::Bind(&DevToolsTracingHandler::BeginReadingRecordingResult,
-                 weak_factory_.GetWeakPtr()));
-}
-
-
 }  // namespace content