Revert of 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"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #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"
 #include "base/win/scoped_handle.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/test/alternate_version_generator.h"
 #include "chrome/installer/util/fake_installation_state.h"
 #include "chrome/installer/util/fake_product_state.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/helper.h"
@@ skipping 568 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) {
-  // Override these paths so that they can be found after the registry override
-  // manager is in place.
-  base::FilePath temp;
-  PathService::Get(base::DIR_PROGRAM_FILES, &temp);
-  base::ScopedPathOverride program_files_override(base::DIR_PROGRAM_FILES,
-                                                  temp);
-  PathService::Get(base::DIR_PROGRAM_FILESX86, &temp);
-  base::ScopedPathOverride program_filesx86_override(base::DIR_PROGRAM_FILESX86,
-                                                     temp);
-  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());
 }