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/ui/views | |
| 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/ui/views')
6 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index 197f926..08f27c9 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -264,7 +264,7 @@ class BookmarkBarViewEventTestBase : public ViewEventTestBase { profile_.reset(new TestingProfile()); profile_->CreateBookmarkModel(true); model_ = BookmarkModelFactory::GetForProfile(profile_.get()); - test::WaitForBookmarkModelToLoad(model_); + bookmarks::test::WaitForBookmarkModelToLoad(model_); profile_->GetPrefs()->SetBoolean(bookmarks::prefs::kShowBookmarkBar, true); Browser::CreateParams native_params(profile_.get(), diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc index e05f822..14609fb 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc @@ -63,7 +63,7 @@ class BookmarkBarViewTest : public BrowserWithTestWindowTest { // BookmarkBarView. void CreateBookmarkModelAndBookmarkBarView() { profile()->CreateBookmarkModel(true); - test::WaitForBookmarkModelToLoad( + bookmarks::test::WaitForBookmarkModelToLoad( BookmarkModelFactory::GetForProfile(profile())); CreateBookmarkBarView(); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc index 9ac3e9f..e4d4c0d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc @@ -31,7 +31,7 @@ class BookmarkBubbleViewTest : public BrowserWithTestWindowTest { profile()->CreateBookmarkModel(true); BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile()); - test::WaitForBookmarkModelToLoad(bookmark_model); + bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model); bookmarks::AddIfNotBookmarked( bookmark_model, GURL(kTestBookmarkURL), base::string16()); diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc index 4d8a382..06f2794 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc @@ -69,7 +69,7 @@ class BookmarkContextMenuTest : public testing::Test { profile_->CreateBookmarkModel(true); model_ = BookmarkModelFactory::GetForProfile(profile_.get()); - test::WaitForBookmarkModelToLoad(model_); + bookmarks::test::WaitForBookmarkModelToLoad(model_); AddTestData(); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc index 9ab145e..6f74b09 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc @@ -40,7 +40,7 @@ class BookmarkEditorViewTest : public testing::Test { profile_->CreateBookmarkModel(true); model_ = BookmarkModelFactory::GetForProfile(profile_.get()); - test::WaitForBookmarkModelToLoad(model_); + bookmarks::test::WaitForBookmarkModelToLoad(model_); AddTestData(); } diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc index d1329c1..aa9a559 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc @@ -28,7 +28,7 @@ class BookmarkMenuDelegateTest : public BrowserWithTestWindowTest { profile()->CreateBookmarkModel(true); model_ = BookmarkModelFactory::GetForProfile(profile()); - test::WaitForBookmarkModelToLoad(model_); + bookmarks::test::WaitForBookmarkModelToLoad(model_); AddTestData(); } |