Refactor NavigationState to use NavigationParams

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/bind.h"
 #include "base/callback.h"
@@ skipping 136 matching lines @@
   // 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.
   DocumentState* document_state = DocumentState::FromDataSource(
       frame->dataSource());
   NavigationState* navigation_state = document_state->navigation_state();
-  CancelPendingClassification(navigation_state->was_within_same_page() ?
-                              NAVIGATE_WITHIN_PAGE : NAVIGATE_AWAY);
+  CancelPendingClassification(navigation_state->WasWithinSamePage()
+                                  ? NAVIGATE_WITHIN_PAGE
+                                  : NAVIGATE_AWAY);
   if (frame == render_view()->GetWebView()->mainFrame()) {
-    last_main_frame_transition_ = navigation_state->transition_type();
+    last_main_frame_transition_ = navigation_state->GetTransitionType();
   }
 }
 
 void PhishingClassifierDelegate::PageCaptured(base::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 112 matching lines @@
   DVLOG(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_,
       base::Bind(&PhishingClassifierDelegate::ClassificationDone,
                  base::Unretained(this)));
 }
 
 }  // namespace safe_browsing