diff options
Diffstat (limited to 'chrome/browser/extensions')
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc index a146048..2eee449 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_apitest.cc @@ -32,7 +32,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_BookmarkManager) { BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile); ChromeBookmarkClient* client = ChromeBookmarkClientFactory::GetForProfile(profile); - test::WaitForBookmarkModelToLoad(model); + bookmarks::test::WaitForBookmarkModelToLoad(model); base::ListValue list; base::DictionaryValue* node = new base::DictionaryValue(); @@ -56,7 +56,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, BookmarkManagerEditDisabled) { // Provide some testing data here, since bookmark editing will be disabled // within the extension. BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile); - test::WaitForBookmarkModelToLoad(model); + bookmarks::test::WaitForBookmarkModelToLoad(model); const BookmarkNode* bar = model->bookmark_bar_node(); const BookmarkNode* folder = model->AddFolder(bar, 0, base::ASCIIToUTF16("Folder")); diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc index 0852e68..2982099 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_api_helpers_unittest.cc @@ -35,7 +35,7 @@ class ExtensionBookmarksTest : public testing::Test { profile_.CreateBookmarkModel(false); model_ = BookmarkModelFactory::GetForProfile(&profile_); client_ = ChromeBookmarkClientFactory::GetForProfile(&profile_); - test::WaitForBookmarkModelToLoad(model_); + bookmarks::test::WaitForBookmarkModelToLoad(model_); node_ = model_->AddURL(model_->other_node(), 0, base::ASCIIToUTF16("Digg"), GURL("http://www.reddit.com")); diff --git a/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc b/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc index 56b75e7..815ba10 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmark_apitest.cc @@ -28,7 +28,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Bookmarks) { BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile); ChromeBookmarkClient* client = ChromeBookmarkClientFactory::GetForProfile(profile); - test::WaitForBookmarkModelToLoad(model); + bookmarks::test::WaitForBookmarkModelToLoad(model); base::ListValue list; base::DictionaryValue* node = new base::DictionaryValue(); 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")); |