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

trunk/src/chrome_frame/test/util_unittests.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 "base/file_version_info.h"
 #include "base/file_version_info_win.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
@@ skipping 16 matching lines @@
   base::FilePath path = GetIETemporaryFilesFolder();
   EXPECT_FALSE(path.empty());
 }
 
 class UtilTests : public testing::Test {
  protected:
   void SetUp() {
     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_;
 };
 
 TEST_F(UtilTests, GetModuleVersionTest) {
   HMODULE mod = GetModuleHandle(L"kernel32.dll");
   EXPECT_NE(mod, static_cast<HMODULE>(NULL));
   wchar_t path[MAX_PATH] = {0};
   GetModuleFileName(mod, path, arraysize(path));
@@ skipping 495 matching lines @@
 
       ASSERT_EQ(expect_match,
                 CheckXUaCompatibleDirective(test.header_value,
                                             all_versions[version_index]))
           << "Expect '" << test.header_value << "' to "
           << (expect_match ? "match" : "not match") << " IE major version "
           << all_versions[version_index];
     }
   }
 }