Fix ProductTest.ProductInstallBasic and InstallerStateTest.InitializeTwice flakes.

chrome/installer/util/installer_state_unittest.cc

Index: chrome/installer/util/installer_state_unittest.cc
diff --git a/chrome/installer/util/installer_state_unittest.cc b/chrome/installer/util/installer_state_unittest.cc
index b3db8b39bd842bbbeb32c95d4a899b15a0e71531..0a8254311c25ab315ffd5abc6caad76f56ae738b 100644
--- a/chrome/installer/util/installer_state_unittest.cc
+++ b/chrome/installer/util/installer_state_unittest.cc
@@ -603,6 +603,17 @@ TEST_F(InstallerStateTest, RemoveOldVersionDirs) {
 }
 
 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();