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

chrome/browser/bookmarks/bookmark_index.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 "chrome/browser/bookmarks/bookmark_index.h"
 
 #include <algorithm>
 #include <iterator>
 #include <list>
 
@@ skipping 94 matching lines @@
   // will run backwards to assure higher relevance will be attributed to the
   // best matches.
   for (NodeTypedCountPairs::const_iterator i = node_typed_counts.begin();
        i != node_typed_counts.end() && results->size() < max_count; ++i)
     AddMatchToResults(i->first, &parser, query_nodes.get(), results);
 }
 
 void BookmarkIndex::SortMatches(const Matches& matches,
                                 NodeTypedCountPairs* node_typed_counts) const {
   HistoryService* const history_service = profile_ ?
-      HistoryServiceFactory::GetForProfile(profile_,

[sky, 2012/06/21 17:14:31]

Keep this as it was.

-                                           Profile::EXPLICIT_ACCESS) : NULL;
+      HistoryServiceFactory::GetForProfileIfExists(
+          profile_, Profile::EXPLICIT_ACCESS) : NULL;
 
   history::URLDatabase* url_db = history_service ?
       history_service->InMemoryDatabase() : NULL;
 
   for (Matches::const_iterator i = matches.begin(); i != matches.end(); ++i)
     ExtractBookmarkNodePairs(url_db, *i, node_typed_counts);
 
   std::sort(node_typed_counts->begin(), node_typed_counts->end(),
             &NodeTypedCountPairSortFunc);
 }
@@ skipping 139 matching lines @@
   Index::iterator i = index_.find(term);
   if (i == index_.end()) {
     // We can get here if the node has the same term more than once. For
     // example, a bookmark with the title 'foo foo' would end up here.
     return;
   }
   i->second.erase(node);
   if (i->second.empty())
     index_.erase(i);
 }