Re-ordering triggering priority of offline pages

chrome/browser/android/offline_pages/offline_page_request_job.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_request_job.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 116 matching lines @@
 NetworkState GetNetworkState(net::URLRequest* request,
                              const OfflinePageHeader& offline_header,
                              previews::PreviewsDecider* previews_decider) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 
   if (offline_header.reason == OfflinePageHeader::Reason::NET_ERROR)
     return NetworkState::FLAKY_NETWORK;
 
   if (net::NetworkChangeNotifier::IsOffline())
     return NetworkState::DISCONNECTED_NETWORK;
+
+  // If offline header contains a reason other than RELOAD, the offline page
+  // should be forced to load even when the network is connected.
+  if (offline_header.reason != OfflinePageHeader::Reason::NONE &&
+      offline_header.reason != OfflinePageHeader::Reason::RELOAD) {
+    return NetworkState::FORCE_OFFLINE_ON_CONNECTED_NETWORK;
+  }
+
   // Checks if previews are allowed, the network is slow, and the request is
   // allowed to be shown for previews.
   if (previews_decider &&
       previews_decider->ShouldAllowPreview(*request,
                                            previews::PreviewsType::OFFLINE)) {
     return NetworkState::PROHIBITIVELY_SLOW_NETWORK;
   }
 
-  // If offline header contains a reason other than RELOAD, the offline page
-  // should be forced to load even when the network is connected.
-  return (offline_header.reason != OfflinePageHeader::Reason::NONE &&
-          offline_header.reason != OfflinePageHeader::Reason::RELOAD)
-             ? NetworkState::FORCE_OFFLINE_ON_CONNECTED_NETWORK
-             : NetworkState::CONNECTED_NETWORK;
+  // Otherwise, the network state is a good network.
+  return NetworkState::CONNECTED_NETWORK;
 }
 
 OfflinePageRequestJob::AggregatedRequestResult
 RequestResultToAggregatedRequestResult(
     RequestResult request_result, NetworkState network_state) {
   if (request_result == RequestResult::NO_TAB_ID)
     return OfflinePageRequestJob::AggregatedRequestResult::NO_TAB_ID;
 
   if (request_result == RequestResult::NO_WEB_CONTENTS)
     return OfflinePageRequestJob::AggregatedRequestResult::NO_WEB_CONTENTS;
@@ skipping 545 matching lines @@
 
   URLRequestJob::NotifyHeadersComplete();
 }
 
 void OfflinePageRequestJob::SetDelegateForTesting(
     std::unique_ptr<Delegate> delegate) {
   delegate_ = std::move(delegate);
 }
 
 }  // namespace offline_pages