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/extensions/api | |
| 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/extensions/api')
3 files changed, 4 insertions, 4 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(); |