Fix ProductTest.ProductInstallBasic and InstallerStateTest.InitializeTwice flakes.

chrome/installer/util/installer_state_unittest.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 <windows.h>
 
 #include <fstream>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 585 matching lines @@
     }
   }
 
   std::set<std::string>::const_iterator iter(
       expected_remaining_dirs.begin());
   for (; iter != expected_remaining_dirs.end(); ++iter)
     ADD_FAILURE() << "Expected to find version dir for " << *iter;
 }
 
 TEST_F(InstallerStateTest, InitializeTwice) {
+  // Force these paths to be cached so that they can be found after the
+  // registry override manager is in place.
+  {
+    base::FilePath temp;
+    PathService::Get(base::DIR_PROGRAM_FILES, &temp);
+    PathService::Get(base::DIR_PROGRAM_FILESX86, &temp);

[robertshield, 2014/08/29 18:49:20]

Can you instead use ScopedPathOverride to explicitly override the PathService
return values with the current ones for the test?

Not sure I like relying on PathService caching which seems more like an
implementation detail than a contract.

[grt (UTC plus 2), 2014/08/29 18:58:31]

Done.

+  }
+  registry_util::RegistryOverrideManager override_manager;
+  override_manager.OverrideRegistry(HKEY_CURRENT_USER, base::string16());
+  override_manager.OverrideRegistry(HKEY_LOCAL_MACHINE, base::string16());
+
   InstallationState machine_state;
   machine_state.Initialize();
 
   InstallerState installer_state;
 
   // Initialize the instance to install multi Chrome.
   {
     CommandLine cmd_line(
         CommandLine::FromString(L"setup.exe --multi-install --chrome"));
     MasterPreferences prefs(cmd_line);
@@ skipping 185 matching lines @@
   // Critical update newer than the new version.
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid());
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(opv_version_, *pv_version_)
           .IsValid());
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(pv_version_, *pv_version_)
           .IsValid());
 }