[tracing] Introduce "allowed_dump_modes" for memory dump config

content/browser/tracing/background_tracing_manager_impl.cc

 // Copyright 2015 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/background_tracing_manager_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/json/json_writer.h"
@@ skipping 32 matching lines @@
   SCENARIO_ACTION_FAILED_LOWRES_CLOCK = 9,
   NUMBER_OF_BACKGROUND_TRACING_METRICS,
 };
 
 void RecordBackgroundTracingMetric(BackgroundTracingMetrics metric) {
   UMA_HISTOGRAM_ENUMERATION("Tracing.Background.ScenarioState", metric,
                             NUMBER_OF_BACKGROUND_TRACING_METRICS);
 }
 
 // Tracing enabled callback for BENCHMARK_MEMORY_LIGHT category preset.
-// TODO(ssid): Remove this when background tracing supports trace config strings
-// and memory-infra supports peak detection crbug.com/609935.
 void BenchmarkMemoryLight_TracingEnabledCallback() {
-  base::trace_event::MemoryDumpManager::GetInstance()->RequestGlobalDump(
+  auto dump_manager = base::trace_event::MemoryDumpManager::GetInstance();
+  CHECK(!dump_manager->IsDumpModeAllowed(

[Primiano Tucci (use gerrit), 2016/06/10 12:31:57]

maybe add a comment saying:
"Safety check to make sure the memory-infra restrictions are properly propagated
via TraceConfig"
or something like that.

[ssid, 2016/06/10 18:23:48]

Done.

+      base::trace_event::MemoryDumpLevelOfDetail::DETAILED));
+  dump_manager->RequestGlobalDump(
       base::trace_event::MemoryDumpType::EXPLICITLY_TRIGGERED,
       base::trace_event::MemoryDumpLevelOfDetail::BACKGROUND);
 }
 
 }  // namespace
 
 BackgroundTracingManagerImpl::TracingTimer::TracingTimer(
     StartedFinalizingCallback callback) : callback_(callback) {
 }
 
@@ skipping 340 matching lines @@
   if (requires_anonymized_data_)
     trace_config.EnableArgumentFilter();
 
   base::Closure tracing_enabled_callback;
   if (!tracing_enabled_callback_for_testing_.is_null()) {
     tracing_enabled_callback = tracing_enabled_callback_for_testing_;
   } else if (preset == BackgroundTracingConfigImpl::CategoryPreset::
                            BENCHMARK_MEMORY_LIGHT) {
     // On memory light mode, the periodic memory dumps are disabled and a single
     // memory dump is requested after tracing is enabled in all the processes.
-    trace_config.ResetMemoryDumpConfig(
-        base::trace_event::TraceConfig::MemoryDumpConfig());
+    // TODO(ssid): Remove this when background tracing supports trace config
+    // strings and memory-infra supports peak detection crbug.com/609935.
+    base::trace_event::TraceConfig::MemoryDumpConfig memory_config;
+    memory_config.allowed_dump_modes =
+        std::set<base::trace_event::MemoryDumpLevelOfDetail>(
+            {base::trace_event::MemoryDumpLevelOfDetail::BACKGROUND});
+    trace_config.ResetMemoryDumpConfig(memory_config);
     tracing_enabled_callback =
         base::Bind(&BenchmarkMemoryLight_TracingEnabledCallback);
   }
 
   is_tracing_ = TracingController::GetInstance()->StartTracing(
       trace_config, tracing_enabled_callback);
   RecordBackgroundTracingMetric(RECORDING_ENABLED);
 }
 
 void BackgroundTracingManagerImpl::OnFinalizeStarted(
@@ skipping 126 matching lines @@
     case BackgroundTracingConfigImpl::CategoryPreset::BLINK_STYLE:
       return "blink_style";
     case BackgroundTracingConfigImpl::CategoryPreset::CATEGORY_PRESET_UNSET:
       NOTREACHED();
   }
   NOTREACHED();
   return "";
 }
 
 }  // namspace content