Use BookmarkModelFactory::GetForBrowserContext everywhere

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/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 64 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());
+    BookmarkModel* model =
+        BookmarkModelFactory::GetForBrowserContext(profile());
     bookmarks::ManagedBookmarkService* managed =
         ManagedBookmarkServiceFactory::GetForProfile(profile());
     controller_ = [[BookmarkBubbleController alloc]
         initWithParentWindow:browser()->window()->GetNativeWindow()
               bubbleObserver:&test_observer_
                      managed:managed
                        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_;
   }
 
   BookmarkModel* GetBookmarkModel() {
-    return BookmarkModelFactory::GetForProfile(profile());
+    return BookmarkModelFactory::GetForBrowserContext(profile());
   }
 
   const BookmarkNode* CreateTestBookmark() {
     BookmarkModel* model = GetBookmarkModel();
     return model->AddURL(model->bookmark_bar_node(),
                          0,
                          ASCIIToUTF16("Bookie markie title"),
                          GURL(kTestBookmarkURL));
   }
 
@@ skipping 269 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());
+  BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
   bookmarks::ManagedBookmarkService* managed =
       ManagedBookmarkServiceFactory::GetForProfile(profile());
   const BookmarkNode* node = CreateTestBookmark();
   BookmarkBubbleController* controller = [[BookmarkBubbleController alloc]
       initWithParentWindow:browser()->window()->GetNativeWindow()
             bubbleObserver:&test_observer_
                    managed:managed
                      model:model
                       node:node
          alreadyBookmarked:NO];  // The last param is the key difference.
@@ skipping 75 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