Fix incorrectly reported UMA OfflinePages.AggregatedRequestResult

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 78 matching lines @@
     DCHECK(!provisional_offline_info_.offline_page ||
       navigated_url == provisional_offline_info_.offline_page->url);
     offline_info_.offline_page =
         std::move(provisional_offline_info_.offline_page);
     offline_info_.offline_header = provisional_offline_info_.offline_header;
     offline_info_.is_offline_preview =
         provisional_offline_info_.is_offline_preview;
   }
   provisional_offline_info_.Clear();
 
+  // If the offline page has been loaded successfully, nothing more to do.
+  net::Error error_code = navigation_handle->GetNetErrorCode();
+  if (error_code == net::OK)
+    return;
+
   // 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
   // eventually fail. To handle this, we will reload the page to force the
   // offline interception if the error code matches the following list.
   // Otherwise, the error page will be shown.
-  net::Error error_code = navigation_handle->GetNetErrorCode();
   if (error_code != net::ERR_INTERNET_DISCONNECTED &&
       error_code != net::ERR_NAME_NOT_RESOLVED &&
       error_code != net::ERR_ADDRESS_UNREACHABLE &&
       error_code != net::ERR_PROXY_CONNECTION_FAILED) {
     // Do not report aborted error since the error page is not shown on this
     // error.
     if (error_code != net::ERR_ABORTED) {
       OfflinePageRequestJob::ReportAggregatedRequestResult(
           OfflinePageRequestJob::AggregatedRequestResult::SHOW_NET_ERROR_PAGE);
     }
@@ skipping 48 matching lines @@
       base::MakeUnique<OfflinePageItem>(offline_page);
   provisional_offline_info_.offline_header = offline_header;
   provisional_offline_info_.is_offline_preview = is_offline_preview;
 }
 
 const OfflinePageItem* OfflinePageTabHelper::GetOfflinePageForTest() const {
   return provisional_offline_info_.offline_page.get();
 }
 
 }  // namespace offline_pages