diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 01:47:03 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-12 01:47:03 +0000 |
| commit | eb378370695559622eb0c4f9a127db1b95b1d35e (patch) | |
| tree | d536333492c10be88ba07bdcdd155a8f5debde7a /chrome_frame | |
| parent | 92908dfef88fdc072224e3ad52bdefa83208857d (diff) | |
| download | chromium_src-eb378370695559622eb0c4f9a127db1b95b1d35e.zip chromium_src-eb378370695559622eb0c4f9a127db1b95b1d35e.tar.gz chromium_src-eb378370695559622eb0c4f9a127db1b95b1d35e.tar.bz2 | |
Base: Make RegistryOverrideManager support sharded/parallel tests.
BUG=314800
TBR=ajwong@chromium.org
Review URL: https://codereview.chromium.org/57423008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.cc | 4 | ||||
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.h | 4 | ||||
| -rw-r--r-- | chrome_frame/test/util_unittests.cc | 4 |
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_; |