[Offline pages]: Move logic for whether to consider the DocumentAvailableInMainFrame signal to the …

chrome/browser/android/offline_pages/prerendering_loader.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/prerendering_loader.h"
 
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/network_change_notifier.h"
 #include "ui/gfx/geometry/size.h"
 
-namespace {
-// Whether to report DomContentLoaded event to the snapshot controller.
-bool kConsiderDclForSnapshot = false;
-// The delay to wait for snapshotting after DomContentLoaded event if
-// kConsiderDclForSnapshot is true.
-long kOfflinePageDclDelayMs = 25000;
-// The delay to wait for snapshotting after OnLoad event.
-long kOfflinePageOnloadDelayMs = 2000;
-}  // namespace
-
-
 namespace offline_pages {
 
-
 // Classifies the appropriate RequestStatus for for the given prerender
 // FinalStatus.
 Offliner::RequestStatus ClassifyFinalStatus(
     prerender::FinalStatus final_status) {
   switch (final_status) {
     // Identify aborted/canceled operations.
 
     case prerender::FINAL_STATUS_CANCELLED:
     // TODO(dougarnett): Reconsider if/when get better granularity (642768)
     case prerender::FINAL_STATUS_UNSUPPORTED_SCHEME:
@@ skipping 78 matching lines @@
           content::WebContents::CreateParams(browser_context_)));
   content::SessionStorageNamespace* sessionStorageNamespace =
       new_web_contents->GetController().GetDefaultSessionStorageNamespace();
   gfx::Size renderWindowSize = new_web_contents->GetContainerBounds().size();
   bool accepted = adapter_->StartPrerender(
       browser_context_, url, sessionStorageNamespace, renderWindowSize);
   if (!accepted)
     return false;
 
   DCHECK(adapter_->IsActive());
-  snapshot_controller_.reset(
-      new SnapshotController(base::ThreadTaskRunnerHandle::Get(), this,
-                             kOfflinePageDclDelayMs,
-                             kOfflinePageOnloadDelayMs));
+  snapshot_controller_ = SnapshotController::CreateForBackgroundOfflining(
+      base::ThreadTaskRunnerHandle::Get(), this);
   load_done_callback_ = load_done_callback;
   progress_callback_ = progress_callback;
   session_contents_.swap(new_web_contents);
   state_ = State::LOADING;
   return true;
 }
 
 void PrerenderingLoader::StopLoading() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   CancelPrerender();
@@ skipping 28 matching lines @@
 }
 
 void PrerenderingLoader::OnPrerenderDomContentLoaded() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!IsIdle());
   if (!adapter_->GetWebContents()) {
     // Without a WebContents object at this point, we are done.
     HandleLoadingStopped();
   } else {
     is_lowbar_met_ = true;
-    if (kConsiderDclForSnapshot) {
-      // Inform SnapshotController of DomContentLoaded event so it can
-      // determine when to consider it really LOADED (e.g., some multiple
-      // second delay from this event).
-      snapshot_controller_->DocumentAvailableInMainFrame();
-    }
+    // Inform SnapshotController of DomContentLoaded event so it can
+    // determine when to consider it really LOADED (e.g., some multiple
+    // second delay from this event).
+    snapshot_controller_->DocumentAvailableInMainFrame();
 
     // Add this signal to signal_data_.
     AddLoadingSignal("OnDomContentLoaded");
   }
 }
 
 void PrerenderingLoader::OnPrerenderStop() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   HandleLoadingStopped();
 }
@@ skipping 94 matching lines @@
   if (adapter_->IsActive()) {
     adapter_->DestroyActive();
   }
   snapshot_controller_.reset(nullptr);
   session_contents_.reset(nullptr);
   state_ = State::IDLE;
   is_lowbar_met_ = false;
 }
 
 }  // namespace offline_pages