chrome.loadTimes() shouldn't be affected by in-document navigation.

chrome/renderer/safe_browsing/phishing_classifier_delegate.cc

 // Copyright (c) 2011 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/safe_browsing/phishing_classifier_delegate.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "chrome/common/safe_browsing/safebrowsing_messages.h"
 #include "chrome/renderer/safe_browsing/feature_extractor_clock.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier.h"
 #include "chrome/renderer/safe_browsing/scorer.h"
+#include "content/public/renderer/document_state.h"
 #include "content/public/renderer/navigation_state.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDocument.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 
+using content::DocumentState;
 using content::NavigationState;
 using content::RenderThread;
 
 namespace safe_browsing {
 
 static GURL StripRef(const GURL& url) {
   GURL::Replacements replacements;
   replacements.ClearRef();
   return url.ReplaceComponents(replacements);
 }
@@ skipping 105 matching lines @@
 
 void PhishingClassifierDelegate::DidCommitProvisionalLoad(
     WebKit::WebFrame* frame, bool is_new_navigation) {
   // A new page is starting to load, so cancel classificaiton.
   //
   // TODO(bryner): We shouldn't need to cancel classification if the navigation
   // is within the same page.  However, if we let classification continue in
   // this case, we need to properly deal with the fact that PageCaptured will
   // be called again for the in-page navigation.  We need to be sure not to
   // swap out the page text while the term feature extractor is still running.
-  NavigationState* state = NavigationState::FromDataSource(
+  DocumentState* document_state = DocumentState::FromDataSource(
       frame->dataSource());
-  CancelPendingClassification(state->was_within_same_page() ?
+  NavigationState* navigation_state = document_state->navigation_state();
+  CancelPendingClassification(navigation_state->was_within_same_page() ?
                               NAVIGATE_WITHIN_PAGE : NAVIGATE_AWAY);
   if (frame == render_view()->GetWebView()->mainFrame()) {
-    last_main_frame_transition_ = state->transition_type();
+    last_main_frame_transition_ = navigation_state->transition_type();
   }
 }
 
 void PhishingClassifierDelegate::PageCaptured(string16* page_text,
                                               bool preliminary_capture) {
   if (preliminary_capture) {
     return;
   }
   // Make sure there's no classification in progress.  We don't want to swap
   // out the page text string from underneath the term feature extractor.
@@ skipping 111 matching lines @@
 
   VLOG(2) << "Starting classification for " << last_finished_load_url_;
   last_url_sent_to_classifier_ = last_finished_load_url_;
   is_classifying_ = true;
   classifier_->BeginClassification(
       &classifier_page_text_,
       NewCallback(this, &PhishingClassifierDelegate::ClassificationDone));
 }
 
 }  // namespace safe_browsing