Remove dependency on bookmark_model_factory from bookmark_test_helpers

chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm

 // Copyright 2014 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 "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
+#include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_test_helpers.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
@@ skipping 81 matching lines @@
       name, scoped_ptr<PrefServiceSyncable>(), base::ASCIIToUTF16(name), 0,
       "asdf", TestingProfile::TestingFactories());
   EXPECT_TRUE(profile->IsManaged());
 
   // http://crbug.com/39725
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       profile, &TemplateURLServiceFactory::BuildInstanceFor);
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       profile, &AutocompleteClassifierFactory::BuildInstanceFor);
   profile->CreateBookmarkModel(true);
-  test::WaitForBookmarkModelToLoad(profile);
+  test::WaitForBookmarkModelToLoad(
+      BookmarkModelFactory::GetForProfile(profile));
 
   Browser* browser =
       new Browser(Browser::CreateParams(profile, chrome::GetActiveDesktop()));
   // Build a new controller to check if it is initialized correctly for a
   // managed user profile.
   base::scoped_nsobject<AvatarIconController> controller(
       [[AvatarIconController alloc] initWithBrowser:browser]);
 
   EXPECT_TRUE([controller labelButtonView]);
 
   browser->window()->Close();
 }