Rearrange SetupMetricsAndFieldTrials to SetupFieldTrials and SetupMetrics

chrome/browser/chrome_browser_main.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 "chrome/browser/chrome_browser_main.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 774 matching lines @@
   net::URLRequest::SetDefaultCookiePolicyToBlock();
 }
 
 ChromeBrowserMainParts::~ChromeBrowserMainParts() {
   for (int i = static_cast<int>(chrome_extra_parts_.size())-1; i >= 0; --i)
     delete chrome_extra_parts_[i];
   chrome_extra_parts_.clear();
 }
 
 // This will be called after the command-line has been mutated by about:flags
-void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() {
-  TRACE_EVENT0("startup", "ChromeBrowserMainParts::SetupMetricsAndFieldTrials");
+void ChromeBrowserMainParts::SetupFieldTrials() {
+  TRACE_EVENT0("startup", "ChromeBrowserMainParts::SetupFieldTrials");
 
   // Initialize FieldTrialList to support FieldTrials that use one-time
   // randomization.
   DCHECK(!field_trial_list_);
   field_trial_list_.reset(
       new base::FieldTrialList(browser_process_->GetMetricsServicesManager()
                                    ->CreateEntropyProvider()
                                    .release()));
 
   const base::CommandLine* command_line =
@@ skipping 28 matching lines @@
 
   std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
 
   // Associate parameters chosen in about:flags and create trial/group for them.
   flags_ui::PrefServiceFlagsStorage flags_storage(
       g_browser_process->local_state());
   std::vector<std::string> variation_ids =
       about_flags::RegisterAllFeatureVariationParameters(
           &flags_storage, feature_list.get());
 
-  // Must initialize metrics after about:flags have been converted into
-  // switches, but before field trials are set up (so that client ID is
-  // available for one-time randomized field trials).
-  metrics::MetricsService* metrics = browser_process_->metrics_service();
-
   variations::VariationsHttpHeaderProvider* http_header_provider =
       variations::VariationsHttpHeaderProvider::GetInstance();
   // Force the variation ids selected in chrome://flags and/or specified using
   // the command-line flag.
   bool result = http_header_provider->ForceVariationIds(
       command_line->GetSwitchValueASCII(switches::kForceVariationIds),
       &variation_ids);
   CHECK(result) << "Invalid list of variation ids specified (either in --"
                 << switches::kForceVariationIds << " or in chrome://flags)";
-  metrics->AddSyntheticTrialObserver(http_header_provider);
 
   feature_list->InitializeFromCommandLine(
       command_line->GetSwitchValueASCII(switches::kEnableFeatures),
       command_line->GetSwitchValueASCII(switches::kDisableFeatures));
 
 #if defined(FIELDTRIAL_TESTING_ENABLED)
   if (!command_line->HasSwitch(switches::kDisableFieldTrialTestingConfig) &&
       !command_line->HasSwitch(switches::kForceFieldTrials) &&
       !command_line->HasSwitch(variations::switches::kVariationsServerURL)) {
     chrome_variations::AssociateDefaultFieldTrialConfig(feature_list.get());
@@ skipping 19 matching lines @@
       command_line->HasSwitch(switches::kTraceUploadURL)) {
     tracing::SetupNavigationTracing();
   }
 
   // Initialize FieldTrialSynchronizer system. This is a singleton and is used
   // for posting tasks via base::Bind. Its deleted when it goes out of scope.
   // Even though base::Bind does AddRef and Release, the object will not be
   // deleted after the Task is executed.
   field_trial_synchronizer_ = new FieldTrialSynchronizer();
 
-  // Now that field trials have been created, initializes metrics recording.
-  metrics->InitializeMetricsRecordingState();
-
-  const version_info::Channel channel = chrome::GetChannel();
-
-  // Enable profiler instrumentation depending on the channel.
-  switch (channel) {
-    case version_info::Channel::UNKNOWN:
-    case version_info::Channel::CANARY:
-      tracked_objects::ScopedTracker::Enable();
-      break;
-
-    case version_info::Channel::DEV:
-    case version_info::Channel::BETA:
-    case version_info::Channel::STABLE:
-      // Don't enable instrumentation.
-      break;
-  }
-
   // Register a synthetic field trial for the sampling profiler configuration
   // that was already chosen.
   sampling_profiler_config_.RegisterSyntheticFieldTrial();
 
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   metrics::DesktopEngagementService::Initialize();
 #endif
 
 #if defined(OS_WIN)
   // Cleanup the PreRead field trial registry key.
   // TODO(fdoray): Remove this when M56 hits stable.
   const base::string16 pre_read_field_trial_registry_path =
       BrowserDistribution::GetDistribution()->GetRegistryPath() +
       L"\\PreReadFieldTrial";
   base::win::RegKey(HKEY_CURRENT_USER,
                     pre_read_field_trial_registry_path.c_str(), KEY_SET_VALUE)
       .DeleteKey(L"");
 #endif  // defined(OS_WIN)
 }
 
-// ChromeBrowserMainParts: |SetupMetricsAndFieldTrials()| related --------------
+void ChromeBrowserMainParts::SetupMetrics() {
+  TRACE_EVENT0("startup", "ChromeBrowserMainParts::SetupMetrics");
+  metrics::MetricsService* metrics = browser_process_->metrics_service();
+  metrics->AddSyntheticTrialObserver(
+      variations::VariationsHttpHeaderProvider::GetInstance());
+  // Now that field trials have been created, initializes metrics recording.
+  metrics->InitializeMetricsRecordingState();
+
+  const version_info::Channel channel = chrome::GetChannel();
+
+  // Enable profiler instrumentation depending on the channel.
+  switch (channel) {
+    case version_info::Channel::UNKNOWN:
+    case version_info::Channel::CANARY:
+      tracked_objects::ScopedTracker::Enable();
+      break;
+
+    case version_info::Channel::DEV:
+    case version_info::Channel::BETA:
+    case version_info::Channel::STABLE:
+      // Don't enable instrumentation.
+      break;
+  }
+}
+
+// ChromeBrowserMainParts: |SetupFieldTrials()| and |SetupMetrics()| related ---
 
 void ChromeBrowserMainParts::StartMetricsRecording() {
   TRACE_EVENT0("startup", "ChromeBrowserMainParts::StartMetricsRecording");
 
   g_browser_process->metrics_service()->CheckForClonedInstall(
       BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE));
 
   g_browser_process->GetMetricsServicesManager()->UpdateUploadPermissions(true);
 }
 
@@ skipping 363 matching lines @@
   // thread, which has a proper CFRunloop, instead of later on the I/O thread,
   // which doesn't. This ensures those notifications will get delivered
   // properly. See issue 37766.
   // (Note that the callback mask here is empty. I don't want to register for
   // any callbacks, I just want to initialize the mechanism.)
   SecKeychainAddCallback(&KeychainCallback, 0, NULL);
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_CHROMEOS)
   // Must be done after g_browser_process is constructed, before
-  // SetupMetricsAndFieldTrials().
+  // SetupFieldTrials() and SetupMetrics().
   chromeos::CrosSettings::Initialize();
 #endif  // defined(OS_CHROMEOS)
 
   SetupOriginTrialsCommandLine();
 
-  // Now the command line has been mutated based on about:flags, we can setup
-  // metrics and initialize field trials. The field trials are needed by
+  // Now the command line has been mutated based on about:flags, we can
+  // initialize field trials and setup metrics. The field trials are needed by
   // IOThread's initialization which happens in BrowserProcess:PreCreateThreads.
-  SetupMetricsAndFieldTrials();
+  SetupFieldTrials();
+  SetupMetrics();
 
   // ChromeOS needs ResourceBundle::InitSharedInstance to be called before this.
   browser_process_->PreCreateThreads();
 
   device::GeolocationProvider::SetGeolocationDelegate(
       new ChromeGeolocationDelegate());
 
   // This needs to be the last thing in PreCreateThreads() because the
   // TaskScheduler needs to be created before any other threads are (by
   // contract) but it creates threads itself so instantiating it earlier is also
-  // incorrect. It also has to be after SetupMetricsAndFieldTrials() to allow it
-  // to use field trials. Note: it could also be the first thing in
-  // CreateThreads() but being in chrome/ is convenient for now as the
-  // initialization uses variations parameters extensively.
+  // incorrect. It also has to be after SetupFieldTrials() to allow it to use
+  // field trials. Note: it could also be the first thing in CreateThreads() but
+  // being in chrome/ is convenient for now as the initialization uses
+  // variations parameters extensively.
   //
   // To maintain scoping symmetry, if this line is moved, the corresponding
   // shutdown call may also need to be moved.
   MaybeInitializeTaskScheduler();
 
   return content::RESULT_CODE_NORMAL_EXIT;
 }
 
 void ChromeBrowserMainParts::MojoShellConnectionStarted(
     content::MojoShellConnection* connection) {
@@ skipping 852 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }