Introduce BookmarkClient interface to abstract embedder

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index 52b110a480c14bd6bf0d054a8d1d73041ef33d34..7b4a5c8b0aed7645f23a432f40921614f227eb37 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -560,7 +560,7 @@ TEST_F(BookmarkBarControllerTest, OffTheSideButtonHidden) {
 
   for (int i = 0; i < 2; i++) {
     bookmark_utils::AddIfNotBookmarked(
-        model, GURL("http://www.foo.com"), ASCIIToUTF16("small"));
+        model, model, GURL("http://www.foo.com"), ASCIIToUTF16("small"));
     EXPECT_TRUE([bar_ offTheSideButtonIsHidden]);
   }
 
@@ -692,9 +692,9 @@ TEST_F(BookmarkBarControllerTest, MenuForFolderNode) {
 
   // Test two bookmarks.
   GURL gurl("http://www.foo.com");
-  bookmark_utils::AddIfNotBookmarked(model, gurl, ASCIIToUTF16("small"));
+  bookmark_utils::AddIfNotBookmarked(model, model, gurl, ASCIIToUTF16("small"));
   bookmark_utils::AddIfNotBookmarked(
-      model, GURL("http://www.cnn.com"), ASCIIToUTF16("bigger title"));
+      model, model, GURL("http://www.cnn.com"), ASCIIToUTF16("bigger title"));
   menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
   EXPECT_EQ([menu numberOfItems], 2);
   NSMenuItem *item = [menu itemWithTitle:@"bigger title"];
@@ -764,13 +764,13 @@ TEST_F(BookmarkBarControllerTest, TestAddRemoveAndClear) {
   // TODO(viettrungluu): make the test independent of window/view size, font
   // metrics, button size and spacing, and everything else.
   base::string16 title1(ASCIIToUTF16("x"));
-  bookmark_utils::AddIfNotBookmarked(model, gurl1, title1);
+  bookmark_utils::AddIfNotBookmarked(model, model, gurl1, title1);
   EXPECT_EQ(1U, [[bar_ buttons] count]);
   EXPECT_EQ(1+initial_subview_count, [[buttonView subviews] count]);
 
   GURL gurl2("http://legion-of-doom.gov");
   base::string16 title2(ASCIIToUTF16("y"));
-  bookmark_utils::AddIfNotBookmarked(model, gurl2, title2);
+  bookmark_utils::AddIfNotBookmarked(model, model, gurl2, title2);
   EXPECT_EQ(2U, [[bar_ buttons] count]);
   EXPECT_EQ(2+initial_subview_count, [[buttonView subviews] count]);
 
@@ -780,7 +780,7 @@ TEST_F(BookmarkBarControllerTest, TestAddRemoveAndClear) {
     EXPECT_EQ(1+initial_subview_count, [[buttonView subviews] count]);
 
     // and bring it back
-    bookmark_utils::AddIfNotBookmarked(model, gurl2, title2);
+    bookmark_utils::AddIfNotBookmarked(model, model, gurl2, title2);
     EXPECT_EQ(2U, [[bar_ buttons] count]);
     EXPECT_EQ(2+initial_subview_count, [[buttonView subviews] count]);
   }
@@ -861,11 +861,11 @@ TEST_F(BookmarkBarControllerTest, CheckForGrowth) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   GURL gurl1("http://www.google.com");
   base::string16 title1(ASCIIToUTF16("x"));
-  bookmark_utils::AddIfNotBookmarked(model, gurl1, title1);
+  bookmark_utils::AddIfNotBookmarked(model, model, gurl1, title1);
 
   GURL gurl2("http://www.google.com/blah");
   base::string16 title2(ASCIIToUTF16("y"));
-  bookmark_utils::AddIfNotBookmarked(model, gurl2, title2);
+  bookmark_utils::AddIfNotBookmarked(model, model, gurl2, title2);
 
   EXPECT_EQ(2U, [[bar_ buttons] count]);
   CGFloat width_1 = [[[bar_ buttons] objectAtIndex:0] frame].size.width;
@@ -944,7 +944,7 @@ TEST_F(BookmarkBarControllerTest, MiddleClick) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   GURL gurl1("http://www.google.com/");
   base::string16 title1(ASCIIToUTF16("x"));
-  bookmark_utils::AddIfNotBookmarked(model, gurl1, title1);
+  bookmark_utils::AddIfNotBookmarked(model, model, gurl1, title1);
 
   EXPECT_EQ(1U, [[bar_ buttons] count]);
   NSButton* first = [[bar_ buttons] objectAtIndex:0];
@@ -1044,7 +1044,7 @@ TEST_F(BookmarkBarControllerTest, TestDragButton) {
                               ASCIIToUTF16("b"),
                               ASCIIToUTF16("c") };
   for (unsigned i = 0; i < arraysize(titles); i++)
-    bookmark_utils::AddIfNotBookmarked(model, gurls[i], titles[i]);
+    bookmark_utils::AddIfNotBookmarked(model, model, gurls[i], titles[i]);
 
   EXPECT_EQ([[bar_ buttons] count], arraysize(titles));
   EXPECT_NSEQ(@"a", [[[bar_ buttons] objectAtIndex:0] title]);
@@ -1116,7 +1116,7 @@ TEST_F(BookmarkBarControllerTest, TestCopyButton) {
                               ASCIIToUTF16("b"),
                               ASCIIToUTF16("c") };
   for (unsigned i = 0; i < arraysize(titles); i++)
-    bookmark_utils::AddIfNotBookmarked(model, gurls[i], titles[i]);
+    bookmark_utils::AddIfNotBookmarked(model, model, gurls[i], titles[i]);
 
   EXPECT_EQ([[bar_ buttons] count], arraysize(titles));
   EXPECT_NSEQ(@"a", [[[bar_ buttons] objectAtIndex:0] title]);
@@ -1139,7 +1139,7 @@ TEST_F(BookmarkBarControllerTest, TestCopyButton) {
 TEST_F(BookmarkBarControllerTest, TestThemedButton) {
   BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   bookmark_utils::AddIfNotBookmarked(
-      model, GURL("http://www.foo.com"), ASCIIToUTF16("small"));
+      model, model, GURL("http://www.foo.com"), ASCIIToUTF16("small"));
   BookmarkButton* button = [[bar_ buttons] objectAtIndex:0];
   EXPECT_TRUE(button);
 
@@ -1171,7 +1171,7 @@ TEST_F(BookmarkBarControllerTest, TestClearOnDealloc) {
                               ASCIIToUTF16("b"),
                               ASCIIToUTF16("c") };
   for (size_t i = 0; i < arraysize(titles); i++)
-    bookmark_utils::AddIfNotBookmarked(model, gurls[i], titles[i]);
+    bookmark_utils::AddIfNotBookmarked(model, model, gurls[i], titles[i]);
 
   // Get and retain the buttons so we can examine them after dealloc.
   base::scoped_nsobject<NSArray> buttons([[bar_ buttons] retain]);