Abort shortcut update on interstitial page.

BUG=42254
TEST=Verify fix for issue 42254.

Review URL: http://codereview.chromium.org/1699006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45492 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index fe7f95e..714268c 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -2294,13 +2294,15 @@ void Browser::LoadingStateChanged(TabContents* source) {
 
     if (!source->is_loading() &&
         pending_web_app_action_ == UPDATE_SHORTCUT) {
-      // Schedule a shortcut update when web application info is available.
+      // Schedule a shortcut update when web application info is available if
+      // last committed entry is not NULL. Last committed entry could be NULL
+      // when an interstitial page is injected (e.g. bad https certificate,
+      // malware site etc). When this happens, we abort the shortcut update.
       NavigationEntry* entry = source->controller().GetLastCommittedEntry();
       if (entry) {
         source->render_view_host()->GetApplicationInfo(entry->page_id());
       } else {
         pending_web_app_action_ = NONE;
-        NOTREACHED();
       }
     }
   }