Win 10 Inactive toast experiment metrics and storage modifications.

chrome/browser/metrics/variations/chrome_variations_service_client.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 "chrome/browser/metrics/variations/chrome_variations_service_client.h"
 
 #include "base/bind.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/channel_info.h"
 #include "components/version_info/version_info.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_WIN)
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/installer/util/google_update_settings.h"

[grt (UTC plus 2), 2017/05/31 12:24:09]

#include "chrome/install_static/install_modes.h"

[nikunjb, 2017/06/02 05:11:22]

Done. (Moving to separate CL)

 #include "chrome/installer/util/install_util.h"
 #include "components/variations/experiment_labels.h"
 #endif
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 #include "chrome/browser/upgrade_detector_impl.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ skipping 16 matching lines @@
   return base::Version(version_info::GetVersionNumber());
 }
 
 #if defined(OS_WIN)
 // Clear all Variations experiment labels from Google Update Registry Labels.
 // TODO(jwd): Remove this once we're confident most clients no longer have these
 // labels (M57-M58 timeframe).
 void ClearGoogleUpdateRegistryLabels() {
   base::ThreadRestrictions::AssertIOAllowed();
 
+  // There is nothing to do if this brand does not support integration with
+  // Google Update.
+  if (!install_static::kUseGoogleUpdateIntegration)
+    return;
+
   // Note that all registry operations are done here on the UI thread as there
   // are no threading restrictions on them.
   const bool is_system_install = !InstallUtil::IsPerUserInstall();
 
   // Read the current bits from the registry.
   base::string16 registry_labels;
   bool success = GoogleUpdateSettings::ReadExperimentLabels(is_system_install,
                                                             &registry_labels);
 
   if (!success) {
@@ skipping 68 matching lines @@
 #if defined(OS_WIN)
   // TODO(jwd): Remove this once we're confident most clients no longer have
   // these labels (M57-M58 timeframe).
   // Do the work on a blocking pool thread, as chrome://profiler has shown that
   // it can cause jank if done on the UI thrread.
   content::BrowserThread::GetBlockingPool()->PostDelayedTask(
       FROM_HERE, base::Bind(&ClearGoogleUpdateRegistryLabels),
       base::TimeDelta::FromSeconds(5));
 #endif
 }