Revert 234367 "Base: Make RegistryOverrideManager support sharde..."

trunk/src/chrome/installer/util/product_state_unittest.cc

 // Copyright (c) 2011 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 "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
 #include "base/version.h"
 #include "base/win/registry.h"
@@ skipping 13 matching lines @@
   static void SetUpTestCase();
   static void TearDownTestCase();
 
   virtual void SetUp();
   virtual void TearDown();
 
   void ApplyUninstallCommand(const wchar_t* exe_path, const wchar_t* args);
   void MinimallyInstallProduct(const wchar_t* version);
 
   static BrowserDistribution* dist_;
+  static std::wstring temp_key_path_;
   bool system_install_;
   HKEY overridden_;
-  registry_util::RegistryOverrideManager registry_override_manager_;
   RegKey clients_;
   RegKey client_state_;
 };
 
 BrowserDistribution* ProductStateTest::dist_;
+std::wstring ProductStateTest::temp_key_path_;
 
 // static
 void ProductStateTest::SetUpTestCase() {
   testing::Test::SetUpTestCase();
 
   // We'll use Chrome as our test subject.
   dist_ = BrowserDistribution::GetSpecificDistribution(
       BrowserDistribution::CHROME_BROWSER);
+
+  // And we'll play in HKCU here:
+  temp_key_path_.assign(RegistryOverrideManager::kTempTestKeyPath)
+      .append(1, L'\\')
+      .append(L"ProductStateTest");
 }
 
 // static
 void ProductStateTest::TearDownTestCase() {
+  temp_key_path_.clear();
   dist_ = NULL;
 
   testing::Test::TearDownTestCase();
 }
 
 void ProductStateTest::SetUp() {
   testing::Test::SetUp();
 
   // Create/open the keys for the product we'll test.
   system_install_ = true;
   overridden_ = (system_install_ ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER);
 
   // Override for test purposes.  We don't use ScopedRegistryKeyOverride
   // directly because it doesn't suit itself to our use here.
   RegKey temp_key;
-
-  registry_override_manager_.OverrideRegistry(overridden_, L"ProductStateTest");
+  EXPECT_EQ(ERROR_SUCCESS,
+            temp_key.Create(HKEY_CURRENT_USER, temp_key_path_.c_str(),
+                            KEY_ALL_ACCESS));
+  EXPECT_EQ(ERROR_SUCCESS,
+            ::RegOverridePredefKey(overridden_, temp_key.Handle()));
 
   EXPECT_EQ(ERROR_SUCCESS,
             clients_.Create(overridden_, dist_->GetVersionKey().c_str(),
                             KEY_ALL_ACCESS));
   EXPECT_EQ(ERROR_SUCCESS,
             client_state_.Create(overridden_, dist_->GetStateKey().c_str(),
                                  KEY_ALL_ACCESS));
 }
 
 void ProductStateTest::TearDown() {
   // Done with the keys.
   client_state_.Close();
   clients_.Close();
+  EXPECT_EQ(ERROR_SUCCESS, ::RegOverridePredefKey(overridden_, NULL));
   overridden_ = NULL;
   system_install_ = false;
 
+  // Shotgun approach to clearing out data we may have written.
+  RegistryOverrideManager::DeleteAllTempKeys();
+
   testing::Test::TearDown();
 }
 
 void ProductStateTest::MinimallyInstallProduct(const wchar_t* version) {
   EXPECT_EQ(ERROR_SUCCESS,
             clients_.WriteValue(google_update::kRegVersionField, version));
 }
 
 void ProductStateTest::ApplyUninstallCommand(const wchar_t* exe_path,
                                              const wchar_t* args) {
@@ skipping 308 matching lines @@
 
   // Uninstall command with --multi-install is multi install.
   {
     ProductState state;
     ApplyUninstallCommand(L"setup.exe",
                           L"--uninstall --chrome --multi-install");
     EXPECT_TRUE(state.Initialize(system_install_, dist_));
     EXPECT_TRUE(state.is_multi_install());
   }
 }