Fix an issue that PrerenderLoader::OnPrerenderStart() never gets called.

chrome/browser/android/offline_pages/prerender_adapter.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/prerender_adapter.h"
 
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 24 matching lines @@
     content::SessionStorageNamespace* session_storage_namespace,
     const gfx::Size& size) {
   DCHECK(!IsActive());
   DCHECK(CanPrerender());
 
   prerender::PrerenderManager* manager =
       prerender::PrerenderManagerFactory::GetForBrowserContext(browser_context);
   DCHECK(manager);
 
   // Start prerendering the url and capture the handle for the prerendering.
+  // Note: PrerenderHandle::OnPrerenderStart() will get called inside

[dougarnett, 2016/09/21 17:01:27]

maybe drop this comment with something similar by new NOTREACHED call

[qinmin, 2016/09/21 17:18:01]

Done.

+  // PrerenderManager::AddPrerenderForOffline(), this is before the observer is
+  // set.
   active_handle_ =
       manager->AddPrerenderForOffline(url, session_storage_namespace, size);
   if (!active_handle_)
     return false;
+  DCHECK(active_handle_->contents());
+  DCHECK(active_handle_->contents()->prerendering_has_started());
 
   active_handle_->SetObserver(this);
+
   return true;
 }
 
 content::WebContents* PrerenderAdapter::GetWebContents() const {
   DCHECK(IsActive());
   DCHECK(active_handle_->contents());
   // Note: the prerender stack maintains ownership of these contents
   // and PrerenderingLoader::StopLoading() must be called to report
   // the Loader is done with the contents.
   return active_handle_->contents()->prerender_contents();
@@ skipping 12 matching lines @@
 void PrerenderAdapter::DestroyActive() {
   DCHECK(IsActive());
   // Clear active handle and call OnCancel from local variable to avoid
   // immediate Observer OnPrerenderStop() call from thinking still active.
   prerender::PrerenderHandle* handle_to_destroy = active_handle_.release();
   handle_to_destroy->OnCancel();
   delete handle_to_destroy;
 }
 
 void PrerenderAdapter::OnPrerenderStart(prerender::PrerenderHandle* handle) {
-  DCHECK_EQ(active_handle_.get(), handle);
-  observer_->OnPrerenderStart();
+  NOTREACHED();

[dougarnett, 2016/09/21 17:01:27]

maybe some comment here instead, eg,

// Not expected as the start event will happen before the observer is set.

[qinmin, 2016/09/21 17:18:01]

Done.

 }
 
 void PrerenderAdapter::OnPrerenderStopLoading(
     prerender::PrerenderHandle* handle) {
   DCHECK_EQ(active_handle_.get(), handle);
   observer_->OnPrerenderStopLoading();
 }
 
 void PrerenderAdapter::OnPrerenderDomContentLoaded(
     prerender::PrerenderHandle* handle) {
   DCHECK_EQ(active_handle_.get(), handle);
   observer_->OnPrerenderDomContentLoaded();
 }
 
 void PrerenderAdapter::OnPrerenderStop(prerender::PrerenderHandle* handle) {
   if (IsActive()) {
     DCHECK_EQ(active_handle_.get(), handle);
     observer_->OnPrerenderStop();
   }
 }
 
 }  // namespace offline_pages