Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6404)

Unified Diff: chrome/browser/sync/test/integration/bookmarks_helper.cc

Issue 2883523002: Reduce the memory usage of bookmarks storage (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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
« no previous file with comments | « no previous file | components/bookmarks/browser/bookmark_codec.cc » ('j') | components/bookmarks/browser/bookmark_codec.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698