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

trunk/src/chrome_frame/test/chrome_frame_test_utils.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_frame/test/chrome_frame_test_utils.h"
 
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <iepmapi.h>
 #include <sddl.h>
@@ skipping 661 matching lines @@
 }
 
 ScopedVirtualizeHklmAndHkcu::ScopedVirtualizeHklmAndHkcu() {
   override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE, L"hklm_fake");
   override_manager_.OverrideRegistry(HKEY_CURRENT_USER, L"hkcu_fake");
 }
 
 ScopedVirtualizeHklmAndHkcu::~ScopedVirtualizeHklmAndHkcu() {
 }
 
+void ScopedVirtualizeHklmAndHkcu::RemoveAllOverrides() {
+  override_manager_.RemoveAllOverrides();
+}
+
 bool KillProcesses(const std::wstring& executable_name, int exit_code,
                    bool wait) {
   bool result = true;
   base::NamedProcessIterator iter(executable_name, NULL);
   while (const base::ProcessEntry* entry = iter.NextProcessEntry()) {
     result &= base::KillProcessById(entry->pid(), exit_code, wait);
   }
   return result;
 }
 
@@ skipping 44 matching lines @@
   if (address.empty()) {
     LOG(ERROR) << "Failed to find a non-loopback IP_V4 address. Tests will be "
                << "run over the loopback adapter, which may result in hangs.";
     address.assign("127.0.0.1");
   }
 
   return address;
 }
 
 }  // namespace chrome_frame_test