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 125 matching lines @@
 }
 
 void PhishingClassifierDelegate::OnStartPhishingDetection(const GURL& url) {
   last_url_received_from_browser_ = StripRef(url);
   // Start classifying the current page if all conditions are met.
   // See MaybeStartClassification() for details.
   MaybeStartClassification();
 }
 
 void PhishingClassifierDelegate::DidCommitProvisionalLoad(
-    bool is_new_navigation,
-    bool is_same_page_navigation) {
+    bool /*is_new_navigation*/,
+    bool /*is_same_page_navigation*/) {

[Charlie Reis, 2017/03/15 02:43:10]

Let's leave this change out.  It's unrelated, and I think it's uncommon in
Chrome code (relative to Blink).

(I also assume we'll change the name of this parameter in RenderFrameObserver in
a followup CL.)

[Eugene But (OOO till 7-30), 2017/03/15 16:16:16]

Done.

   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

[Charlie Reis, 2017/03/15 02:43:10]

s/page/document/

[Eugene But (OOO till 7-30), 2017/03/15 16:16:16]

Done.

   // 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

[Charlie Reis, 2017/03/15 02:43:10]

s/in-page/same-document/

[Eugene But (OOO till 7-30), 2017/03/15 16:16:16]

Done.

   // 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 117 matching lines @@
       &classifier_page_text_,
       base::Bind(&PhishingClassifierDelegate::ClassificationDone,
                  base::Unretained(this)));
 }
 
 void PhishingClassifierDelegate::OnDestruct() {
   delete this;
 }
 
 }  // namespace safe_browsing