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

This reverts commit 98ee7dd64463c42a076782c923330107e60b8fad.

Reapply of https://codereview.chromium.org/57423008 now that a blocking issue has been fixed.

BUG=314800
TBR=grt,owners

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

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

3 files changed, 0 insertions, 12 deletions

diff --git a/chrome_frame/test/chrome_frame_test_utils.cc b/chrome_frame/test/chrome_frame_test_utils.cc
index 298a7c2..6c7fb48 100644
--- a/chrome_frame/test/chrome_frame_test_utils.cc
+++ b/chrome_frame/test/chrome_frame_test_utils.cc
@@ -679,10 +679,6 @@ 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 f9c08e2..316d57c 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -338,10 +338,6 @@ 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 e6dbd65..74e41f9 100644
--- a/chrome_frame/test/util_unittests.cc
+++ b/chrome_frame/test/util_unittests.cc
@@ -34,10 +34,6 @@ 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_;