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

trunk/src/chrome_frame/test/chrome_frame_test_utils.h

 // 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.
 
 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
 #define CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
 
 #include <windows.h>
 
 #include <atlbase.h>
@@ skipping 320 matching lines @@
 base::ProcessHandle StartCrashService();
 
 // Used in tests where we reference the registry and don't want to run into
 // problems where existing registry settings might conflict with the
 // expectations of the test.
 class ScopedVirtualizeHklmAndHkcu {
  public:
   ScopedVirtualizeHklmAndHkcu();
   ~ScopedVirtualizeHklmAndHkcu();
 
+  // Removes all overrides and deletes all temporary test keys used by the
+  // overrides.
+  void RemoveAllOverrides();
+
  protected:
   registry_util::RegistryOverrideManager override_manager_;
 };
 
 // Attempts to kill all the processes on the current machine that were launched
 // from the given executable name, ending them with the given exit code.  If
 // filter is non-null, then only processes selected by the filter are killed.
 // Returns true if all processes were able to be killed off, false if at least
 // one couldn't be killed.
 // NOTE: This function is based on the base\process_util.h helper function
@@ skipping 14 matching lines @@
 }  // namespace chrome_frame_test
 
 // TODO(tommi): This is a temporary workaround while we're getting our
 // Singleton story straight.  Ideally each test should clear up any singletons
 // it might have created, but test cases do not implicitly have their own
 // AtExitManager, so we have this workaround method for tests that depend on
 // "fresh" singletons.  The implementation is in chrome_frame_unittest_main.cc.
 void DeleteAllSingletons();
 
 #endif  // CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_