diff options
| author | tfarina <tfarina@chromium.org> | 2014-10-23 10:46:11 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-23 17:46:55 +0000 |
| commit | 8f4aae2cb156bd96e8b7fcb3948ae9bc5da27573 (patch) | |
| tree | 0dd41f067a7bee249322f7ff59f9340acb4d1259 /chrome/browser/sync | |
| parent | a0458670a47098dc18fdcdac2ecdfdbfc552eb66 (diff) | |
| download | chromium_src-8f4aae2cb156bd96e8b7fcb3948ae9bc5da27573.zip chromium_src-8f4aae2cb156bd96e8b7fcb3948ae9bc5da27573.tar.gz chromium_src-8f4aae2cb156bd96e8b7fcb3948ae9bc5da27573.tar.bz2 | |
bookmarks: Move bookmark_test_helpers.h into 'bookmarks' namespace.
BUG=370433
TEST=components_unittests, unit_tests
R=sky@chromium.org
TBR=joaodasilva@chromium.org
Review URL: https://codereview.chromium.org/651753003
Cr-Commit-Position: refs/heads/master@{#300911}
Diffstat (limited to 'chrome/browser/sync')
3 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc index 5468d20..7f01963 100644 --- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc +++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc @@ -124,7 +124,7 @@ class SyncBookmarkDataTypeControllerTest : public testing::Test { bookmark_model_ = static_cast<BookmarkModel*>( BookmarkModelFactory::GetInstance()->SetTestingFactoryAndUse( &profile_, BuildBookmarkModel)); - test::WaitForBookmarkModelToLoad(bookmark_model_); + bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model_); } else { bookmark_model_ = static_cast<BookmarkModel*>( BookmarkModelFactory::GetInstance()->SetTestingFactoryAndUse( @@ -205,7 +205,7 @@ TEST_F(SyncBookmarkDataTypeControllerTest, StartBookmarkModelNotReady) { profile_.GetIOTaskRunner(), content::BrowserThread::GetMessageLoopProxyForThread( content::BrowserThread::UI)); - test::WaitForBookmarkModelToLoad(bookmark_model_); + bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model_); EXPECT_EQ(DataTypeController::MODEL_LOADED, bookmark_dtc_->state()); bookmark_dtc_->StartAssociating( diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index bd7a38c..071efe9 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -274,7 +274,7 @@ class FakeServerChange { class ExtensiveChangesBookmarkModelObserver : public BaseBookmarkModelObserver { public: - explicit ExtensiveChangesBookmarkModelObserver() + ExtensiveChangesBookmarkModelObserver() : started_count_(0), completed_count_at_started_(0), completed_count_(0) {} @@ -399,7 +399,7 @@ class ProfileSyncServiceBookmarkTest : public testing::Test { bool delete_bookmarks = load == DELETE_EXISTING_STORAGE; profile_.CreateBookmarkModel(delete_bookmarks); model_ = BookmarkModelFactory::GetForProfile(&profile_); - test::WaitForBookmarkModelToLoad(model_); + bookmarks::test::WaitForBookmarkModelToLoad(model_); // This noticeably speeds up the unit tests that request it. if (save == DONT_SAVE_TO_STORAGE) model_->ClearStore(); diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc index dc27dc4..729bc7e 100644 --- a/chrome/browser/sync/test/integration/sync_test.cc +++ b/chrome/browser/sync/test/integration/sync_test.cc @@ -350,7 +350,7 @@ bool SyncTest::SetupClients() { // Create the verifier profile. verifier_ = MakeProfile(FILE_PATH_LITERAL("Verifier")); - test::WaitForBookmarkModelToLoad( + bookmarks::test::WaitForBookmarkModelToLoad( BookmarkModelFactory::GetForProfile(verifier())); ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( verifier(), Profile::EXPLICIT_ACCESS)); @@ -395,7 +395,7 @@ void SyncTest::InitializeInstance(int index) { << index << "."; InitializeInvalidations(index); - test::WaitForBookmarkModelToLoad( + bookmarks::test::WaitForBookmarkModelToLoad( BookmarkModelFactory::GetForProfile(GetProfile(index))); ui_test_utils::WaitForHistoryToLoad(HistoryServiceFactory::GetForProfile( GetProfile(index), Profile::EXPLICIT_ACCESS)); |