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

Unified Diff: chrome/browser/sessions/tab_loader.cc

Issue 2466883002: Add TabLoaderTest (Closed)
Patch Set: Use ScopedFeatureList Created 4 years, 1 month 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
« no previous file with comments | « chrome/browser/sessions/tab_loader.h ('k') | chrome/browser/sessions/tab_loader_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sessions/tab_loader.cc
diff --git a/chrome/browser/sessions/tab_loader.cc b/chrome/browser/sessions/tab_loader.cc
index ba5fb2149ecc87e3abe6c52c4f4c45eef836a945..16c9026dbf37647658e668bf9a355733d309e0a6 100644
--- a/chrome/browser/sessions/tab_loader.cc
+++ b/chrome/browser/sessions/tab_loader.cc
@@ -115,7 +115,9 @@ void TabLoader::StartLoading(const std::vector<RestoredTab>& tabs) {
favicon::ContentFaviconDriver* favicon_driver =
favicon::ContentFaviconDriver::FromWebContents(
restored_tab.contents());
- favicon_driver->FetchFavicon(favicon_driver->GetActiveURL());
+ // |favicon_driver| might be null when testing.
+ if (favicon_driver)
+ favicon_driver->FetchFavicon(favicon_driver->GetActiveURL());
} else {
tabs_loading_.insert(&restored_tab.contents()->GetController());
}
« no previous file with comments | « chrome/browser/sessions/tab_loader.h ('k') | chrome/browser/sessions/tab_loader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698