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

> Base: Make RegistryOverrideManager support sharded/parallel tests.
> 
> BUG=314800
> TBR=ajwong@chromium.org
> 
> Review URL: https://codereview.chromium.org/57423008

TBR=tommycli@chromium.org

Review URL: https://codereview.chromium.org/69793004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234627 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 12 insertions, 0 deletions

diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 6c7fb48..298a7c2 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -679,6 +679,10 @@ ScopedVirtualizeHklmAndHkcu::ScopedVirtualizeHklmAndHkcu() {
 ScopedVirtualizeHklmAndHkcu::~ScopedVirtualizeHklmAndHkcu() {
 }
 
+void ScopedVirtualizeHklmAndHkcu::RemoveAllOverrides() {
+  override_manager_.RemoveAllOverrides();
+}
+
 bool KillProcesses(const std::wstring& executable_name, int exit_code,
                    bool wait) {
   bool result = true;
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index 316d57c..f9c08e2 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -338,6 +338,10 @@ class ScopedVirtualizeHklmAndHkcu {
   ScopedVirtualizeHklmAndHkcu();
   ~ScopedVirtualizeHklmAndHkcu();
 
+  // Removes all overrides and deletes all temporary test keys used by the
+  // overrides.
+  void RemoveAllOverrides();
+
  protected:
   registry_util::RegistryOverrideManager override_manager_;
 };
diff --git a/chrome_frame/test/util_unittests.cc b/chrome_frame/test/util_unittests.cc
index 74e41f9..e6dbd65 100644
--- a/chrome_frame/test/util_unittests.cc
+++ b/chrome_frame/test/util_unittests.cc
@@ -34,6 +34,10 @@ class UtilTests : public testing::Test {
     DeleteAllSingletons();
   }
 
+  void TearDown() {
+    registry_virtualization_.RemoveAllOverrides();
+  }
+
   // This is used to manage life cycle of PolicySettings singleton.
   // base::ShadowingAtExitManager at_exit_manager_;
   chrome_frame_test::ScopedVirtualizeHklmAndHkcu registry_virtualization_;