Fix ProductTest.ProductInstallBasic and InstallerStateTest.InitializeTwice flakes.

chrome/installer/util/product_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 "chrome/installer/util/product_unittest.h"
 
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
@@ skipping 58 matching lines @@
   ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir));
   EXPECT_FALSE(user_data_dir.empty());
 
   base::FilePath program_files;
   ASSERT_TRUE(PathService::Get(base::DIR_PROGRAM_FILES, &program_files));
   // The User Data path should never be under program files, even though
   // system_level is true.
   EXPECT_EQ(std::wstring::npos,
             user_data_dir.value().find(program_files.value()));
 
-  // There should be no installed version in the registry.
-  machine_state.Initialize();
-  EXPECT_TRUE(machine_state.GetProductState(
-      system_level, distribution->GetType()) == NULL);
-
   HKEY root = installer_state.root_key();
   {
     RegistryOverrideManager override_manager;
     override_manager.OverrideRegistry(root, L"root_pit");
 
+    // There should be no installed version in the registry.
+    machine_state.Initialize();
+    EXPECT_TRUE(machine_state.GetProductState(
+        system_level, distribution->GetType()) == NULL);
+
     // Let's pretend chrome is installed.
     RegKey version_key(root, distribution->GetVersionKey().c_str(),
                        KEY_ALL_ACCESS);
     ASSERT_TRUE(version_key.Valid());
 
     const char kCurrentVersion[] = "1.2.3.4";
     Version current_version(kCurrentVersion);
     version_key.WriteValue(google_update::kRegVersionField,
                            base::UTF8ToWide(
                                current_version.GetString()).c_str());
@@ skipping 23 matching lines @@
     if (chrome_state != NULL)
       EXPECT_TRUE(chrome_state->is_msi());
   }
 }
 
 TEST_F(ProductTest, LaunchChrome) {
   // TODO(tommi): Test Product::LaunchChrome and
   // Product::LaunchChromeAndWait.
   LOG(ERROR) << "Test not implemented.";
 }