diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-04 20:39:27 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-04 20:39:27 +0000 |
| commit | 016cb876ffa4aa9010fd69ef1da463dcb4b39445 (patch) | |
| tree | bbb6ee4e1ad251fbf40d0140db02caa017a1ae4f /chrome/browser/policy | |
| parent | 6a5f77c3df9771d76333e665df587f5a31e08f41 (diff) | |
| download | chromium_src-016cb876ffa4aa9010fd69ef1da463dcb4b39445.zip chromium_src-016cb876ffa4aa9010fd69ef1da463dcb4b39445.tar.gz chromium_src-016cb876ffa4aa9010fd69ef1da463dcb4b39445.tar.bz2 | |
Remove broken test.
The case tested never actually happens, and leads to accessing freed memory.
TBR=joaodasilva@chromium.org
BUG=None
TEST=URLBlacklistManagerTest.* doesn't crash
Review URL: http://codereview.chromium.org/7835020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99609 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/policy')
| -rw-r--r-- | chrome/browser/policy/url_blacklist_manager_unittest.cc | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc index 3e42119..37b152f 100644 --- a/chrome/browser/policy/url_blacklist_manager_unittest.cc +++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc @@ -138,16 +138,6 @@ TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask1) { } TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask2) { - // Update posts a BuildBlacklistTask to the FILE thread. - blacklist_manager_->UpdateNotMocked(); - // Shutdown comes before the task is executed. - blacklist_manager_->ShutdownOnUIThread(); - blacklist_manager_.reset(); - // Run the task after shutdown and deletion. - loop_.RunAllPending(); -} - -TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask3) { EXPECT_CALL(*blacklist_manager_, SetBlacklist(_)).Times(0); // Update posts a BuildBlacklistTask to the FILE thread. blacklist_manager_->UpdateNotMocked(); @@ -160,7 +150,7 @@ TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask3) { loop_.RunAllPending(); } -TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask4) { +TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask3) { EXPECT_CALL(*blacklist_manager_, SetBlacklist(_)).Times(0); // This posts a task to the FILE thread. @@ -173,7 +163,7 @@ TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask4) { Mock::VerifyAndClearExpectations(blacklist_manager_.get()); } -TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask5) { +TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask4) { EXPECT_CALL(*blacklist_manager_, SetBlacklist(_)).Times(0); // This posts a task to the FILE thread. |