Introduce ChromeBookmarkClientFactory

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/chrome_bookmark_client.h"
+#include "chrome/browser/bookmarks/chrome_bookmark_client_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/info_bubble_window.h"
 #include "chrome/test/base/testing_profile.h"
+#include "components/bookmarks/browser/bookmark_model.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 using base::ASCIIToUTF16;
 using content::WebContents;
 
 // Watch for bookmark pulse notifications so we can confirm they were sent.
@@ skipping 50 matching lines @@
     CocoaProfileTest::TearDown();
   }
 
   // Returns a controller but ownership not transferred.
   // Only one of these will be valid at a time.
   BookmarkBubbleController* ControllerForNode(const BookmarkNode* node) {
     if (controller_ && !IsWindowClosing()) {
       [controller_ close];
       controller_ = nil;
     }
+    BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
     ChromeBookmarkClient* client =
-        BookmarkModelFactory::GetChromeBookmarkClientForProfile(profile());
+        ChromeBookmarkClientFactory::GetForProfile(profile());
     controller_ = [[BookmarkBubbleController alloc]
         initWithParentWindow:browser()->window()->GetNativeWindow()
                       client:client
+                       model:model
                         node:node
            alreadyBookmarked:YES];
     EXPECT_TRUE([controller_ window]);
     // The window must be gone or we'll fail a unit test with windows left open.
     [static_cast<InfoBubbleWindow*>([controller_ window])
         setAllowedAnimations:info_bubble::kAnimateNone];
     [controller_ showWindow:nil];
     return controller_;
   }
 
@@ skipping 276 matching lines @@
   [button selectItemWithTitle:[[controller class] chooseAnotherFolderString]];
   EXPECT_EQ(edits_, 0);
   [button sendAction:[button action] to:[button target]];
   EXPECT_EQ(edits_, 1);
 }
 
 // Create a controller that simulates the bookmark just now being created by
 // the user clicking the star, then sending the "cancel" command to represent
 // them pressing escape. The bookmark should not be there.
 TEST_F(BookmarkBubbleControllerTest, EscapeRemovesNewBookmark) {
+  BookmarkModel* model = BookmarkModelFactory::GetForProfile(profile());
   ChromeBookmarkClient* client =
-      BookmarkModelFactory::GetChromeBookmarkClientForProfile(profile());
+      ChromeBookmarkClientFactory::GetForProfile(profile());
   const BookmarkNode* node = CreateTestBookmark();
-  BookmarkBubbleController* controller =
-      [[BookmarkBubbleController alloc]
-          initWithParentWindow:browser()->window()->GetNativeWindow()
-                        client:client
-                          node:node
-             alreadyBookmarked:NO];  // The last param is the key difference.
+  BookmarkBubbleController* controller = [[BookmarkBubbleController alloc]
+      initWithParentWindow:browser()->window()->GetNativeWindow()
+                    client:client
+                     model:model
+                      node:node
+         alreadyBookmarked:NO];  // The last param is the key difference.
   EXPECT_TRUE([controller window]);
   // Calls release on controller.
   [controller cancel:nil];
-  EXPECT_FALSE(client->model()->IsBookmarked(GURL(kTestBookmarkURL)));
+  EXPECT_FALSE(model->IsBookmarked(GURL(kTestBookmarkURL)));
 }
 
 // Create a controller where the bookmark already existed prior to clicking
 // the star and test that sending a cancel command doesn't change the state
 // of the bookmark.
 TEST_F(BookmarkBubbleControllerTest, EscapeDoesntTouchExistingBookmark) {
   const BookmarkNode* node = CreateTestBookmark();
   BookmarkBubbleController* controller = ControllerForNode(node);
   EXPECT_TRUE(controller);
 
@@ skipping 61 matching lines @@
 // Normally this would be sent up the responder tree correctly, but since
 // tests run in the background, key window and main window are never set on
 // NSApplication. Adding it to NSApplication directly removes the need for
 // worrying about what the current window with focus is.
 - (void)editBookmarkNode:(id)sender {
   EXPECT_TRUE([sender respondsToSelector:@selector(node)]);
   BookmarkBubbleControllerTest::edits_++;
 }
 
 @end