| Index: chrome/browser/sync/test/integration/bookmarks_helper.cc
|
| diff --git a/chrome/browser/sync/test/integration/bookmarks_helper.cc b/chrome/browser/sync/test/integration/bookmarks_helper.cc
|
| index da2ab1c139a709a3cc71509beb0699a577dbb0ad..2db6549061c99034fcb76e487e2b5df35742d9e7 100644
|
| --- a/chrome/browser/sync/test/integration/bookmarks_helper.cc
|
| +++ b/chrome/browser/sync/test/integration/bookmarks_helper.cc
|
| @@ -222,7 +222,7 @@ FaviconData GetFaviconData(BookmarkModel* model,
|
| const BookmarkNode* node) {
|
| // If a favicon wasn't explicitly set for a particular URL, simply return its
|
| // blank favicon.
|
| - if (!urls_with_favicons_ ||
|
| + if (!urls_with_favicons_ || !node->icon_url() ||
|
| urls_with_favicons_->find(node->url()) == urls_with_favicons_->end()) {
|
| return FaviconData();
|
| }
|
| @@ -233,7 +233,7 @@ FaviconData GetFaviconData(BookmarkModel* model,
|
| model->GetFavicon(node);
|
| observer.WaitForGetFavicon();
|
| }
|
| - return FaviconData(model->GetFavicon(node), node->icon_url());
|
| + return FaviconData(model->GetFavicon(node), *node->icon_url());
|
| }
|
|
|
| // Sets the favicon for |profile| and |node|. |profile| may be
|
|
|