summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/lazy_background_page_apitest.cc
diff options
context:
space:
mode:
authortfarina <tfarina@chromium.org>2014-10-23 10:46:11 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-23 17:46:55 +0000
commit8f4aae2cb156bd96e8b7fcb3948ae9bc5da27573 (patch)
tree0dd41f067a7bee249322f7ff59f9340acb4d1259 /chrome/browser/extensions/lazy_background_page_apitest.cc
parenta0458670a47098dc18fdcdac2ecdfdbfc552eb66 (diff)
downloadchromium_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/extensions/lazy_background_page_apitest.cc')
-rw-r--r--chrome/browser/extensions/lazy_background_page_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/lazy_background_page_apitest.cc b/chrome/browser/extensions/lazy_background_page_apitest.cc
index bd9af90..2438a5e 100644
--- a/chrome/browser/extensions/lazy_background_page_apitest.cc
+++ b/chrome/browser/extensions/lazy_background_page_apitest.cc
@@ -385,7 +385,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, DISABLED_IncognitoSplitMode) {
page2_complete(incognito_browser->profile());
BookmarkModel* bookmark_model =
BookmarkModelFactory::GetForProfile(browser()->profile());
- test::WaitForBookmarkModelToLoad(bookmark_model);
+ bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
const BookmarkNode* parent = bookmark_model->bookmark_bar_node();
bookmark_model->AddURL(
parent, 0, base::ASCIIToUTF16("Title"), GURL("about:blank"));
@@ -503,7 +503,7 @@ IN_PROC_BROWSER_TEST_F(LazyBackgroundPageApiTest, EventDispatchToTab) {
// Send an event by making a bookmark.
BookmarkModel* bookmark_model =
BookmarkModelFactory::GetForProfile(browser()->profile());
- test::WaitForBookmarkModelToLoad(bookmark_model);
+ bookmarks::test::WaitForBookmarkModelToLoad(bookmark_model);
bookmarks::AddIfNotBookmarked(bookmark_model,
GURL("http://www.google.com"),
base::UTF8ToUTF16("Google"));