Renamed WasWithinSamePage to WasWithinSameDocument.

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 <memory>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 131 matching lines @@
   MaybeStartClassification();
 }
 
 void PhishingClassifierDelegate::DidCommitProvisionalLoad(
     bool is_new_navigation,
     bool is_same_page_navigation) {
   blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
   // 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
+  // is within the same document.  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.
+  // be called again for the same-document navigation.  We need to be sure not
+  // to swap out the page text while the term feature extractor is still
+  // running.
   DocumentState* document_state = DocumentState::FromDataSource(
       frame->dataSource());
   NavigationState* navigation_state = document_state->navigation_state();
-  CancelPendingClassification(navigation_state->WasWithinSamePage()
+  CancelPendingClassification(navigation_state->WasWithinSameDocument()
                                   ? NAVIGATE_WITHIN_PAGE
                                   : NAVIGATE_AWAY);
   if (frame->parent())
     return;
 
   last_main_frame_transition_ = navigation_state->GetTransitionType();
 }
 
 void PhishingClassifierDelegate::PageCaptured(base::string16* page_text,
                                               bool preliminary_capture) {
@@ skipping 66 matching lines @@
   // load completes), we discard the page text since it won't be needed.
   if (!classifier_->is_ready()) {
     DVLOG(2) << "Not starting classification, no Scorer created.";
     // Keep classifier_page_text_, in case a Scorer is set later.
     return;
   }
 
   if (last_main_frame_transition_ & ui::PAGE_TRANSITION_FORWARD_BACK) {
     // Skip loads from session history navigation.  However, update the
     // last URL sent to the classifier, so that we'll properly detect
-    // in-page navigations.
+    // same-document navigations.
     DVLOG(2) << "Not starting classification for back/forward navigation";
     last_url_sent_to_classifier_ = last_finished_load_url_;
     classifier_page_text_.clear();  // we won't need this.
     have_page_text_ = false;
     return;
   }
 
   GURL stripped_last_load_url(StripRef(last_finished_load_url_));
   if (stripped_last_load_url == StripRef(last_url_sent_to_classifier_)) {
     // We've already classified this toplevel URL, so this was likely an
-    // in-page navigation or a subframe navigation.  The browser should not
-    // send a StartPhishingDetection IPC in this case.
+    // same-document navigation or a subframe navigation.  The browser should
+    // not send a StartPhishingDetection IPC in this case.
     DVLOG(2) << "Toplevel URL is unchanged, not starting classification.";
     classifier_page_text_.clear();  // we won't need this.
     have_page_text_ = false;
     return;
   }
 
   if (!have_page_text_) {
     DVLOG(2) << "Not starting classification, there is no page text ready.";
     return;
   }
@@ skipping 18 matching lines @@
       &classifier_page_text_,
       base::Bind(&PhishingClassifierDelegate::ClassificationDone,
                  base::Unretained(this)));
 }
 
 void PhishingClassifierDelegate::OnDestruct() {
   delete this;
 }
 
 }  // namespace safe_browsing