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

chrome/browser/bookmarks/bookmark_storage.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_storage.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/file_util_proxy.h"
@@ skipping 126 matching lines @@
 void BookmarkStorage::DoLoadBookmarks(const FilePath& path) {
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&LoadCallback, path, make_scoped_refptr(this),
                  details_.get()));
 }
 
 void BookmarkStorage::MigrateFromHistory() {
   // We need to wait until history has finished loading before reading
   // from generated bookmarks file.
-  HistoryService* history =

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

Keep this as it was.

-      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  HistoryService* history = HistoryServiceFactory::GetForProfileIfExists(
+      profile_, Profile::EXPLICIT_ACCESS);
   if (!history) {
     // This happens in unit tests.
     if (model_)
       model_->DoneLoading(details_.release());
     return;
   }
   if (!history->BackendLoaded()) {
     // The backend isn't finished loading. Wait for it.
     notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_LOADED,
                                 content::Source<Profile>(profile_));
@@ skipping 81 matching lines @@
     NOTREACHED();
     return false;
   }
 
   std::string data;
   if (!SerializeData(&data))
     return false;
   writer_.WriteNow(data);
   return true;
 }