Set the WebViewDelegate earlier during WebView creation to ensure that...

chrome/renderer/render_view.cc

 // Copyright (c) 2009 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/renderer/render_view.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1058 matching lines @@
   WebFrame* main_frame = webview()->GetMainFrame();
 
   if (main_frame->GetProvisionalDataSource()) {
     // If we have a provisional frame we are between the start
     // and commit stages of loading...ignore this paint.
     return;
   }
 
   WebDataSource* ds = main_frame->GetDataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
-  // TODO(darin): It should not be possible for navigation_state to
-  // be null here! But the UI test DownloadTest.IncognitoDownload
-  // can cause it to happen.
-  if (navigation_state) {
-    Time now = Time::Now();
-    if (navigation_state->first_paint_time().is_null()) {
-      navigation_state->set_first_paint_time(now);
-    }
-    if (navigation_state->first_paint_after_load_time().is_null() &&
-        !navigation_state->finish_load_time().is_null()) {
-      navigation_state->set_first_paint_after_load_time(now);
-    }
+  DCHECK(navigation_state);
+
+  Time now = Time::Now();
+  if (navigation_state->first_paint_time().is_null()) {
+    navigation_state->set_first_paint_time(now);
+  }
+  if (navigation_state->first_paint_after_load_time().is_null() &&
+      !navigation_state->finish_load_time().is_null()) {
+    navigation_state->set_first_paint_after_load_time(now);
   }
 }
 
 void RenderView::DidStartProvisionalLoadForFrame(
     WebView* webview,
     WebFrame* frame,
     NavigationGesture gesture) {
   WebDataSource* ds = frame->GetProvisionalDataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
 
@@ skipping 210 matching lines @@
                                  WebFrame* frame) {
   UpdateTitle(frame, title);
 
   // Also check whether we have new encoding name.
   UpdateEncoding(frame, webview->GetMainFrameEncodingName());
 }
 
 void RenderView::DidFinishLoadForFrame(WebView* webview, WebFrame* frame) {
   WebDataSource* ds = frame->GetDataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
-  // TODO(darin): It should not be possible for navigation_state to be null
-  // here!
-  if (navigation_state)
-    navigation_state->set_finish_load_time(Time::Now());
+  DCHECK(navigation_state);
+  navigation_state->set_finish_load_time(Time::Now());
 }
 
 void RenderView::DidFailLoadWithError(WebView* webview,
                                       const WebURLError& error,
                                       WebFrame* frame) {
   // Currently this function is empty. When you implement something here and it
   // will display any error messages in HTML, please make sure to call
   // frame->SetInViewSourceMode(false) not to show them in view source mode.
 }
 
 void RenderView::DidFinishDocumentLoadForFrame(WebView* webview,
                                                WebFrame* frame) {
   WebDataSource* ds = frame->GetDataSource();
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
-  // TODO(darin): It should not be possible for navigation_state to be null
-  // here!
-  if (navigation_state)
-    navigation_state->set_finish_document_load_time(Time::Now());
+  DCHECK(navigation_state);
+  navigation_state->set_finish_document_load_time(Time::Now());
 
   Send(new ViewHostMsg_DocumentLoadedInFrame(routing_id_));
 
   // The document has now been fully loaded.  Scan for password forms to be
   // sent up to the browser.
   SendPasswordForms(frame);
 
   // Check whether we have new encoding name.
   UpdateEncoding(frame, webview->GetMainFrameEncodingName());
 
@@ skipping 1367 matching lines @@
 void RenderView::DidAddHistoryItem() {
   // We don't want to update the history length for the start page
   // navigation.
   WebFrame* main_frame = webview()->GetMainFrame();
   DCHECK(main_frame != NULL);
 
   WebDataSource* ds = main_frame->GetDataSource();
   DCHECK(ds != NULL);
 
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
+  DCHECK(navigation_state);
   if (navigation_state->transition_type() == PageTransition::START_PAGE)
     return;
 
   history_back_list_count_++;
   history_forward_list_count_ = 0;
 }
 
 void RenderView::OnMessageFromExternalHost(const std::string& message,
                                            const std::string& origin,
                                            const std::string& target) {
@@ skipping 230 matching lines @@
     Send(new ViewHostMsg_PasswordFormsSeen(routing_id_, password_forms));
 }
 
 void RenderView::Print(WebFrame* frame, bool script_initiated) {
   DCHECK(frame);
   if (print_helper_.get() == NULL) {
     print_helper_.reset(new PrintWebViewHelper(this));
   }
   print_helper_->Print(frame, script_initiated);
 }