Integrates the SnapshotController into the PrerenderingLoader to provide logic for determining when…

chrome/browser/android/offline_pages/prerendering_loader.cc

Index: chrome/browser/android/offline_pages/prerendering_loader.cc
diff --git a/chrome/browser/android/offline_pages/prerendering_loader.cc b/chrome/browser/android/offline_pages/prerendering_loader.cc
index 7ae17b30408590067ad75d5768409d26e5dcd9cc..b82a149ab9ddb0be4d9b23bb4c051f37614d5029 100644
--- a/chrome/browser/android/offline_pages/prerendering_loader.cc
+++ b/chrome/browser/android/offline_pages/prerendering_loader.cc
@@ -16,7 +16,9 @@
 namespace offline_pages {
 
 PrerenderingLoader::PrerenderingLoader(content::BrowserContext* browser_context)
-    : state_(State::IDLE), browser_context_(browser_context) {
+    : state_(State::IDLE),
+      snapshot_controller_(nullptr),
+      browser_context_(browser_context) {
   adapter_.reset(new PrerenderAdapter(this));
 }
 
@@ -49,6 +51,8 @@ bool PrerenderingLoader::LoadPage(const GURL& url,
     return false;
 
   DCHECK(adapter_->IsActive());
+  snapshot_controller_.reset(
+      new SnapshotController(base::ThreadTaskRunnerHandle::Get(), this));
   callback_ = callback;
   state_ = State::PENDING;
   return true;
@@ -88,14 +92,25 @@ void PrerenderingLoader::OnPrerenderStart() {
 
 void PrerenderingLoader::OnPrerenderStopLoading() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  // TODO(dougarnett): Implement/integrate to delay policy here.
-  HandleLoadEvent();
+  DCHECK(!IsIdle());
+  DCHECK(adapter_->GetWebContents());
+  // Inform SnapshotController of OnLoad event so it can determine
+  // when to consider it really LOADED.
+  snapshot_controller_->DocumentOnLoadCompletedInMainFrame();
 }
 
 void PrerenderingLoader::OnPrerenderDomContentLoaded() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  // TODO(dougarnett): Implement/integrate to delay policy here.
-  HandleLoadEvent();
+  DCHECK(!IsIdle());
+  if (!adapter_->GetWebContents()) {
+    // Without a WebContents object at this point, we are done.
+    HandleLoadingStopped();
+  } else {
+    // Inform SnapshotController of DomContentContent event so it can
+    // determine when to consider it really LOADED (e.g., some multiple
+    // second delay from this event).
+    snapshot_controller_->DocumentAvailableInMainFrame();
+  }
 }
 
 void PrerenderingLoader::OnPrerenderStop() {
@@ -103,6 +118,11 @@ void PrerenderingLoader::OnPrerenderStop() {
   HandleLoadingStopped();
 }
 
+void PrerenderingLoader::StartSnapshot() {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  HandleLoadEvent();
+}
+
 void PrerenderingLoader::HandleLoadEvent() {
   // If still loading, check if the load succeeded or not, then update
   // the internal state (LOADED for success or IDLE for failure) and post
@@ -148,6 +168,7 @@ void PrerenderingLoader::HandleLoadingStopped() {
                  : Offliner::RequestStatus::FAILED;
   // TODO(dougarnett): For failure, determine from final status if retry-able
   // and report different failure statuses if retry-able or not.
+  snapshot_controller_.reset(nullptr);
   session_contents_.reset(nullptr);
   state_ = State::IDLE;
   base::ThreadTaskRunnerHandle::Get()->PostTask(
@@ -158,6 +179,7 @@ void PrerenderingLoader::CancelPrerender() {
   if (adapter_->IsActive()) {
     adapter_->DestroyActive();
   }
+  snapshot_controller_.reset(nullptr);
   session_contents_.reset(nullptr);
   if (!IsLoaded() && !IsIdle()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(