Fixing some more instances where I put in HistoryServiceFactory::GetForProfile which will force cre…

chrome/browser/bookmarks/bookmark_model_unittest.cc

 // 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.
 
 #include <set>
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 1051 matching lines @@
   GURL url("http://www.google.com");
   bookmark_utils::AddIfNotBookmarked(bb_model_, url, string16());
 
   HistoryServiceFactory::GetForProfile(
       profile_.get(), Profile::EXPLICIT_ACCESS)->AddPage(
           url, NULL, 1, GURL(), content::PAGE_TRANSITION_TYPED,
           history::RedirectList(), history::SOURCE_BROWSED, false);
 
   // This won't actually delete the URL, rather it'll empty out the visits.
   // This triggers blocking on the BookmarkModel.
-  profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)->DeleteURL(url);
+  HistoryServiceFactory::GetForProfile(
+      profile_, Profile::EXPLICIT_ACCESS)->DeleteURL(url);
 }
 
 TEST_F(BookmarkModelTest, Sort) {
   // Populate the bookmark bar node with nodes for 'B', 'a', 'd' and 'C'.
   // 'C' and 'a' are folders.
   TestNode bbn;
   PopulateNodeFromString("B [ a ] d [ a ]", &bbn);
   const BookmarkNode* parent = model_.bookmark_bar_node();
   PopulateBookmarkNode(&bbn, &model_, parent);
 
@@ skipping 76 matching lines @@
   AssertExtensiveChangesObserverCount(1, 0);
   model_.EndExtensiveChanges();
   EXPECT_TRUE(model_.IsDoingExtensiveChanges());
   AssertExtensiveChangesObserverCount(1, 0);
   model_.EndExtensiveChanges();
   EXPECT_FALSE(model_.IsDoingExtensiveChanges());
   AssertExtensiveChangesObserverCount(1, 1);
 }
 
 }  // namespace