| Index: chrome/browser/bookmarks/bookmark_model.cc
|
| diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc
|
| index bdef521c129de0f1391d277f20f5c4bb1599867e..72ec0569ff58d7d533e76c1b0190ff266f2a45dc 100644
|
| --- a/chrome/browser/bookmarks/bookmark_model.cc
|
| +++ b/chrome/browser/bookmarks/bookmark_model.cc
|
| @@ -219,7 +219,7 @@ BookmarkModel::~BookmarkModel() {
|
| FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
|
| BookmarkModelBeingDeleted(this));
|
|
|
| - if (store_) {
|
| + if (store_.get()) {
|
| // The store maintains a reference back to us. We need to tell it we're gone
|
| // so that it doesn't try and invoke a method back on us again.
|
| store_->BookmarkModelDeleted();
|
| @@ -253,7 +253,7 @@ void BookmarkModel::Load(
|
| content::Source<Profile>(profile_));
|
|
|
| // Load the bookmarks. BookmarkStorage notifies us when done.
|
| - store_ = new BookmarkStorage(profile_, this, task_runner);
|
| + store_ = new BookmarkStorage(profile_, this, task_runner.get());
|
| store_->LoadBookmarks(CreateLoadDetails());
|
| }
|
|
|
|
|