Remove dependency on bookmark_model_factory from bookmark_test_helpers

Remove dependency on bookmark_model_factory from bookmark_test_helpers

Remove the helper function test::WaitForBookmarkModelToLoad(Profile*) and
port client to use test::WaitForBookmarkModelToLoad(BookmarkModel*) instead.

BUG=367839
TBR=sky

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=268214

[sdefresne, 2014-04-28 18:02:42]

PTAL

[tfarina, 2014-04-28 18:13:56]

I was planning to do this myself, since I added these functions.

But since you already picked it, thanks!

lgtm.

[sky, 2014-04-28 20:27:10]

LGTM

[tfarina, 2014-04-28 22:13:50]

The CQ bit was checked by tfarina@chromium.org

[commit-bot: I haz the power, 2014-04-28 22:14:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sdefresne@chromium.org/257003004/1

[commit-bot: I haz the power, 2014-04-28 22:14:17]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-28 22:14:17]

Failed to apply patch for chrome/browser/bookmarks/bookmark_test_helpers.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/bookmarks/bookmark_test_helpers.cc
  Hunk #1 FAILED at 10.
  1 out of 2 hunks FAILED -- saving rejects to file
chrome/browser/bookmarks/bookmark_test_helpers.cc.rej

Patch:       chrome/browser/bookmarks/bookmark_test_helpers.cc
Index: chrome/browser/bookmarks/bookmark_test_helpers.cc
diff --git a/chrome/browser/bookmarks/bookmark_test_helpers.cc
b/chrome/browser/bookmarks/bookmark_test_helpers.cc
index
8a05ff4a5d193da5808c8c8dc9a37b0308091d49..31d9aada637cafa1985b83bb5cc31b933c8f3497
100644
--- a/chrome/browser/bookmarks/bookmark_test_helpers.cc
+++ b/chrome/browser/bookmarks/bookmark_test_helpers.cc
@@ -10,7 +10,6 @@
 #include "base/logging.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "components/bookmarks/core/browser/base_bookmark_model_observer.h"
 #include "components/bookmarks/core/browser/bookmark_model.h"
 #include "content/public/test/test_utils.h"
@@ -108,10 +107,6 @@ void WaitForBookmarkModelToLoad(BookmarkModel* model) {
   DCHECK(model->loaded());
 }
 
-void WaitForBookmarkModelToLoad(Profile* profile) {
-  WaitForBookmarkModelToLoad(BookmarkModelFactory::GetForProfile(profile));
-}
-
 std::string ModelStringFromNode(const BookmarkNode* node) {
   // Since the children of the node are not available as a vector,
   // we'll just have to do it the hard way.

[sdefresne, 2014-04-30 11:05:33]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2014-04-30 11:05:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sdefresne@chromium.org/257003004/30001

[commit-bot: I haz the power, 2014-04-30 11:16:59]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-30 11:16:59]

Try jobs failed on following builders:
  linux_chromium_rel on tryserver.chromium

[sdefresne, 2014-04-30 11:44:04]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2014-04-30 11:44:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sdefresne@chromium.org/257003004/50001

[commit-bot: I haz the power, 2014-04-30 11:58:12]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-30 11:58:13]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel on tryserver.chromium

[tfarina, 2014-04-30 20:05:25]

You need to fix:
chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc:32
and
chrome/browser/ui/views/bookmarks/bookmark_bar_view_unittest.cc:49

[sdefresne, 2014-05-01 14:33:46]

The CQ bit was checked by sdefresne@chromium.org

[sdefresne, 2014-05-01 14:33:54]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2014-05-01 14:33:59]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sdefresne@chromium.org/257003004/70001

[commit-bot: I haz the power, 2014-05-01 14:53:02]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-01 14:53:02]

Try jobs failed on following builders:
  android_clang_dbg on tryserver.chromium

[sdefresne, 2014-05-01 15:30:56]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2014-05-01 15:31:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sdefresne@chromium.org/257003004/90001

[commit-bot: I haz the power, 2014-05-01 16:19:31]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-01 16:19:32]

Try jobs failed on following builders:
  linux_chromium_chromeos_rel on tryserver.chromium

[sdefresne, 2014-05-05 14:05:38]

The CQ bit was checked by sdefresne@chromium.org

[commit-bot: I haz the power, 2014-05-05 14:06:02]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/sdefresne@chromium.org/257003004/110001

[commit-bot: I haz the power, 2014-05-05 17:41:08]

Change committed as 268214