Fix the disappearance of "Offline" chip from the LocationBar when navigating to a fragment.

chrome/browser/android/offline_pages/offline_page_tab_helper.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/offline_pages/offline_page_tab_helper.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/offline_pages/offline_page_request_job.h"
@@ skipping 23 matching lines @@
 void OfflinePageTabHelper::DidStartNavigation(
     content::NavigationHandle* navigation_handle) {
   // Skips non-main frame.
   if (!navigation_handle->IsInMainFrame())
     return;
 
   // This is a new navigation so we can invalidate any previously scheduled
   // operations.
   weak_ptr_factory_.InvalidateWeakPtrs();
 
+  new_offline_page_ = nullptr;

[dewittj, 2016/09/15 23:17:40]

s/new/provisional?

[Dmitry Titov, 2016/09/16 02:01:25]

Done.

+
   // Since this is a new navigation, we will reset the cached offline page,
-  offline_page_ = nullptr;
   is_offline_preview_ = false;
-
   reloading_url_on_net_error_ = false;
 }
 
 void OfflinePageTabHelper::DidFinishNavigation(
     content::NavigationHandle* navigation_handle) {
   // Skips non-main frame.
   if (!navigation_handle->IsInMainFrame())
     return;
 
+  if (!navigation_handle->HasCommitted())
+    return;
+
+  if (navigation_handle->IsSamePage()) {
+    return;
+  }
+
+  offline_page_ = std::move(new_offline_page_);

[dewittj, 2016/09/15 23:17:39]

new_offline_page_ could be in indeterminate state?

[Dmitry Titov, 2016/09/16 02:01:25]

Done. Explicitly assigned nullptr. Not sure this is needed though :)

+
   // We might be reloading the URL in order to fetch the offline page.
   // * If successful, nothing to do.
   // * Otherwise, we're hitting error again. Bail out to avoid loop.
   if (reloading_url_on_net_error_)
     return;
 
   // When the navigation starts, the request might be intercepted to serve the
   // offline content if the network is detected to be in disconnected or poor
   // conditions. This detection might not work for some cases, i.e., connected
   // to a hotspot or proxy that does not have network, and the navigation will
@@ skipping 47 matching lines @@
   content::NavigationController::LoadURLParams load_params(offline_page->url);
   load_params.transition_type = ui::PAGE_TRANSITION_RELOAD;
   load_params.extra_headers = kOfflinePageHeader;
   load_params.extra_headers += ":";
   load_params.extra_headers += kOfflinePageHeaderReasonKey;
   load_params.extra_headers += "=";
   load_params.extra_headers += kOfflinePageHeaderReasonValueDueToNetError;
   web_contents()->GetController().LoadURLWithParams(load_params);
 }
 
+// This is a callback from network request interceptor. It happens between
+// DidStartNavigation and DidFinishNavigation calls on this tab helper.
 void OfflinePageTabHelper::SetOfflinePage(const OfflinePageItem& offline_page,
                                           bool is_offline_preview) {
-  offline_page_ = base::MakeUnique<OfflinePageItem>(offline_page);
+  new_offline_page_ = base::MakeUnique<OfflinePageItem>(offline_page);
   is_offline_preview_ = is_offline_preview;
 }
 
 }  // namespace offline_pages