Revert of Move memory-infra check from background tracing and whitelist memory dump args

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 34 matching lines @@
 };
 
 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.
 void BenchmarkMemoryLight_TracingEnabledCallback() {
   auto dump_manager = base::trace_event::MemoryDumpManager::GetInstance();
+  // Safety check to make sure the memory-infra restrictions are properly
+  // propagated via TraceConfig
+  CHECK(!dump_manager->IsDumpModeAllowed(
+      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 494 matching lines @@
     case BackgroundTracingConfigImpl::CategoryPreset::BLINK_STYLE:
       return "blink_style";
     case BackgroundTracingConfigImpl::CategoryPreset::CATEGORY_PRESET_UNSET:
       NOTREACHED();
   }
   NOTREACHED();
   return "";
 }
 
 }  // namspace content