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/test | |
| 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/test')
| -rw-r--r-- | chrome/browser/sync/test/integration/sync_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
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)); |