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..cdc88ce487941cb600a912834325258532f71452 100644
--- a/chrome/installer/util/installer_state_unittest.cc
+++ b/chrome/installer/util/installer_state_unittest.cc
@@ -15,6 +15,7 @@
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/scoped_path_override.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/version.h"
 #include "base/win/registry.h"
@@ -603,6 +604,18 @@ TEST_F(InstallerStateTest, RemoveOldVersionDirs) {
 }
 
 TEST_F(InstallerStateTest, InitializeTwice) {
+  // Override these paths so that they can be found after the registry override
+  // manager is in place.
+  base::ScopedPathOverride program_files_override(
+      base::DIR_PROGRAM_FILES,
+      base::FilePath(FILE_PATH_LITERAL("C:\\Program Files (x86)")));

[robertshield, 2014/08/29 19:08:40]

Should this path not contain the (x86) bit?

Also, to be stricter could the override value be pulled from PathService here
before the reg override stuff kicks in?

[grt (UTC plus 2), 2014/08/29 19:13:07]

Ultimately, it doesn't matter what the strings are since they're never used to
access the disk, but I can see a pure correctness argument.

+  base::ScopedPathOverride program_filesx86_override(
+      base::DIR_PROGRAM_FILESX86,
+      base::FilePath(FILE_PATH_LITERAL("C:\\Program Files (x86)")));
+  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();