Make --enable-benchmarking not affect metrics recording.

components/metrics_services_manager/metrics_services_manager.cc

 // Copyright 2014 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 "components/metrics_services_manager/metrics_services_manager.h"
 
 #include <utility>
 
+#include "base/command_line.h"
 #include "base/logging.h"
 #include "components/metrics/metrics_service.h"
 #include "components/metrics/metrics_service_client.h"
 #include "components/metrics/metrics_state_manager.h"
+#include "components/metrics/metrics_switches.h"
 #include "components/metrics_services_manager/metrics_services_manager_client.h"
 #include "components/rappor/rappor_service_impl.h"
 #include "components/ukm/ukm_service.h"
 #include "components/variations/service/variations_service.h"
 
 namespace metrics_services_manager {
 
 MetricsServicesManager::MetricsServicesManager(
     std::unique_ptr<MetricsServicesManagerClient> client)
     : client_(std::move(client)), may_upload_(false), may_record_(false) {
@@ skipping 73 matching lines @@
   // controls whether FINE metrics are sent.
   may_record_ = current_may_record;
   may_upload_ = current_may_upload;
   UpdateRunningServices();
 }
 
 void MetricsServicesManager::UpdateRunningServices() {
   DCHECK(thread_checker_.CalledOnValidThread());
   metrics::MetricsService* metrics = GetMetricsService();
 
-  if (client_->OnlyDoMetricsRecording()) {
+  const base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
+  if (cmdline->HasSwitch(metrics::switches::kMetricsRecordingOnly)) {
     metrics->StartRecordingForTests();
     GetRapporServiceImpl()->Update(true, false);
     return;
   }
 
   client_->UpdateRunningServices(may_record_, may_upload_);
 
   if (may_record_) {
     if (!metrics->recording_active())
       metrics->Start();
@@ skipping 29 matching lines @@
   }
 }
 
 void MetricsServicesManager::UpdateUploadPermissions(bool may_upload) {
   UpdatePermissions((client_->IsMetricsReportingForceEnabled() ||
                      client_->IsMetricsReportingEnabled()),
                     client_->IsMetricsReportingForceEnabled() || may_upload);
 }
 
 }  // namespace metrics_services_manager