diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 01:18:24 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-25 01:18:24 +0000 |
| commit | 4308801ad9a5d7bad08786754bdec70fae6fd6c9 (patch) | |
| tree | 669f1e2408b7b2f5053a26c043282ebd8970d5b2 /chrome/test/live_sync | |
| parent | 0bbc6bf00554deac900bc6228c49a8463adece94 (diff) | |
| download | chromium_src-4308801ad9a5d7bad08786754bdec70fae6fd6c9.zip chromium_src-4308801ad9a5d7bad08786754bdec70fae6fd6c9.tar.gz chromium_src-4308801ad9a5d7bad08786754bdec70fae6fd6c9.tar.bz2 | |
Removing unnecessary override LiveBookmarksSyncTest::SetupSync().
BookmarkModelVerifier::Create() is called by LiveBookmarksSyncTest::SetupClients() and LiveBookmarksSyncTest::SetupSync(). This results in a duplicate bookmarks bar in the verifier profile, causing some tests to fail.
LiveSyncTest::SetupSync() polymorphically calls LiveBookmarksSyncTest::SetupClients(). Therefore, the correct fix is to remove the override method LiveBookmarksSyncTest::SetupSync(), since there is no need to do anything additional there.
BUG=47451
TEST=sync_integration_tests
Review URL: http://codereview.chromium.org/2851024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50801 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/live_sync')
| -rw-r--r-- | chrome/test/live_sync/live_bookmarks_sync_test.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/test/live_sync/live_bookmarks_sync_test.h b/chrome/test/live_sync/live_bookmarks_sync_test.h index 7d52ab5..f8f0cc9 100644 --- a/chrome/test/live_sync/live_bookmarks_sync_test.h +++ b/chrome/test/live_sync/live_bookmarks_sync_test.h @@ -37,16 +37,6 @@ class LiveBookmarksSyncTest : public LiveSyncTest { return (verifier_helper_.get() != NULL); } - // Sets up sync profiles and clients, syncs each of them, and initializes the - // verifier bookmark model. - virtual bool SetupSync() { - if (!LiveSyncTest::SetupSync()) - return false; - verifier_helper_.reset(BookmarkModelVerifier::Create( - GetVerifierBookmarkModel())); - return (verifier_helper_.get() != NULL); - } - // Used to access the bookmarks within a particular sync profile. BookmarkModel* GetBookmarkModel(int index) { return GetProfile(index)->GetBookmarkModel(); |