Use a valid /prefetch argument when launching a process.

components/startup_metric_utils/common/pre_read_field_trial_utils_win.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 "components/startup_metric_utils/common/pre_read_field_trial_utils_win.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
@@ skipping 13 matching lines @@
 // registered so that UMA metrics recorded during the current startup are
 // annotated with the pre-read group that is actually used during this startup.
 const char kPreReadSyntheticFieldTrialName[] = "SyntheticPreRead";
 
 // Variation names for the PreRead field trial.
 const base::char16 kNoPreReadVariationName[] = L"NoPreRead";
 const base::char16 kHighPriorityVariationName[] = L"HighPriority";
 const base::char16 kOnlyIfColdVariationName[] = L"OnlyIfCold";
 const base::char16 kPrefetchVirtualMemoryVariationName[] =
     L"PrefetchVirtualMemory";
+const base::char16 kNoPrefetchArgumentVariationName[] = L"NoPrefetchArgument";

[gab, 2016/01/26 21:40:26]

It may not be clear to a reader that the reason some of those are "negative" is
that they all change the default, i.e. the default is the inverse of the
variation and thus variations that cancel something we do by default are
negative.

How about describing this in the meta comment for these variable names?

[fdoray, 2016/01/27 20:12:19]

Done.

 
 // Registry key in which the PreRead field trial group is stored.
 const base::char16 kPreReadFieldTrialRegistryKey[] = L"\\PreReadFieldTrial";
 
 // Pre-read options to use for the current process. This is initialized by
 // InitializePreReadOptions().
 PreReadOptions g_pre_read_options = {false, false, false, false};
 
 // Returns the registry path in which the PreRead group is stored.
 base::string16 GetPreReadRegistryPath(
     const base::string16& product_registry_path) {
   return product_registry_path + kPreReadFieldTrialRegistryKey;
 }
 
+// Returns true if |key| has a value named |name| which is not zero.
+bool ReadBool(const base::win::RegKey& key, const base::char16* name) {
+  DWORD value = 0;
+  return key.ReadValueDW(name, &value) == ERROR_SUCCESS && value != 0;
+}
+
 }  // namespace
 
 void InitializePreReadOptions(const base::string16& product_registry_path) {
   DCHECK(!product_registry_path.empty());
 
   // Open the PreRead field trial's registry key.
   const base::string16 registry_path =
       GetPreReadRegistryPath(product_registry_path);
   const base::win::RegKey key(HKEY_CURRENT_USER, registry_path.c_str(),
                               KEY_QUERY_VALUE);
 
   // Set the PreRead field trial's options.
-  struct {
-    const base::char16* name;
-    bool* option;
-  } const variations_mappings[] = {
-      {kNoPreReadVariationName, &g_pre_read_options.no_pre_read},
-      {kHighPriorityVariationName, &g_pre_read_options.high_priority},
-      {kOnlyIfColdVariationName, &g_pre_read_options.only_if_cold},
-      {kPrefetchVirtualMemoryVariationName,
-       &g_pre_read_options.prefetch_virtual_memory},
-  };
-
-  for (const auto& mapping : variations_mappings) {
-    // Set the option variable to true if the corresponding value is found in
-    // the registry. Set to false otherwise (default behavior).
-    DWORD value = 0;
-    if (key.ReadValueDW(mapping.name, &value) == ERROR_SUCCESS) {
-      DCHECK_EQ(1U, value);
-      DCHECK(!*mapping.option);
-      *mapping.option = true;
-    }
-  }
+  g_pre_read_options.pre_read = !ReadBool(key, kNoPreReadVariationName);
+  g_pre_read_options.high_priority = ReadBool(key, kHighPriorityVariationName);
+  g_pre_read_options.only_if_cold = ReadBool(key, kOnlyIfColdVariationName);
+  g_pre_read_options.prefetch_virtual_memory =
+      ReadBool(key, kPrefetchVirtualMemoryVariationName);
+  g_pre_read_options.prefetch_argument =
+      !ReadBool(key, kNoPrefetchArgumentVariationName);
 }
 
 PreReadOptions GetPreReadOptions() {
   return g_pre_read_options;
 }
 
 void UpdatePreReadOptions(const base::string16& product_registry_path) {
   DCHECK(!product_registry_path.empty());
 
   const base::string16 registry_path =
@@ skipping 50 matching lines @@
   base::string16 group;
   key.ReadValue(L"", &group);
 
   if (!group.empty()) {
     register_synthetic_field_trial.Run(kPreReadSyntheticFieldTrialName,
                                        base::UTF16ToUTF8(group));
   }
 }
 
 }  // namespace startup_metric_utils