Roll trace-viewer deps to the latest.

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 <set>
 #include <string>
 #include <vector>
 
@@ skipping 68 matching lines @@
   if (!tracing_options) {
     LOG(ERROR) << "tracing_options can't be passed as NULL";
     return false;
   }
 
   bool options_ok = true;
   std::string category_filter_string;
   options_ok &= options->GetString("categoryFilter", &category_filter_string);
   *category_filter = base::trace_event::CategoryFilter(category_filter_string);
 
+  std::string record_mode;
+  options_ok &=
+      options->GetString("tracingRecordMode", &record_mode);
+  options_ok &= tracing_options->SetFromString(record_mode);
+
   options_ok &= options->GetBoolean("useSystemTracing",
                                     &tracing_options->enable_systrace);
   options_ok &=
       options->GetBoolean("useSampling", &tracing_options->enable_sampling);
 
-  bool use_continuous_tracing;
-  options_ok &=
-      options->GetBoolean("useContinuousTracing", &use_continuous_tracing);
-
-  if (use_continuous_tracing)
-    tracing_options->record_mode = base::trace_event::RECORD_CONTINUOUSLY;
-  else
-    tracing_options->record_mode = base::trace_event::RECORD_UNTIL_FULL;
-
   if (!options_ok) {
     LOG(ERROR) << "Malformed options";
     return false;
   }
   return true;
 }
 
 void OnRecordingEnabledAck(const WebUIDataSource::GotDataCallback& callback);
 
 bool BeginRecording(const std::string& data64,
@@ skipping 244 matching lines @@
     web_ui()->CallJavascriptFunction("onUploadComplete",
                                      base::StringValue(feedback));
   } else {
     web_ui()->CallJavascriptFunction("onUploadError",
                                      base::StringValue(feedback));
   }
   trace_uploader_.reset();
 }
 
 }  // namespace content