Renamed NavigationHandle::IsSamePage to NavigationHandle::IsSameDocument

content/browser/android/web_contents_observer_proxy.cc

 // Copyright 2015 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 "content/browser/android/web_contents_observer_proxy.h"
 
 #include <string>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 118 matching lines @@
 }
 
 void WebContentsObserverProxy::DidStartNavigation(
     NavigationHandle* navigation_handle) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, navigation_handle->GetURL().spec()));
   Java_WebContentsObserverProxy_didStartNavigation(
       env, obj, jstring_url, navigation_handle->IsInMainFrame(),
-      navigation_handle->IsSamePage(), navigation_handle->IsErrorPage());
+      navigation_handle->IsSameDocument(), navigation_handle->IsErrorPage());
 }
 
 void WebContentsObserverProxy::DidFinishNavigation(
     NavigationHandle* navigation_handle) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj(java_observer_);
   ScopedJavaLocalRef<jstring> jstring_url(
       ConvertUTF8ToJavaString(env, navigation_handle->GetURL().spec()));
 
-  bool is_fragment_navigation = navigation_handle->IsSamePage();
+  bool is_fragment_navigation = navigation_handle->IsSameDocument();
 
   if (navigation_handle->HasCommitted()) {
     // See http://crbug.com/251330 for why it's determined this way.
     url::Replacements<char> replacements;
     replacements.ClearRef();
     bool urls_same_ignoring_fragment =
         navigation_handle->GetURL().ReplaceComponents(replacements) ==
         navigation_handle->GetPreviousURL().ReplaceComponents(replacements);
     is_fragment_navigation &= urls_same_ignoring_fragment;
   }
 
   // TODO(shaktisahu): Provide appropriate error description (crbug/690784).
   ScopedJavaLocalRef<jstring> jerror_description;
 
   Java_WebContentsObserverProxy_didFinishNavigation(
       env, obj, jstring_url, navigation_handle->IsInMainFrame(),
       navigation_handle->IsErrorPage(), navigation_handle->HasCommitted(),
-      navigation_handle->IsSamePage(), is_fragment_navigation,
+      navigation_handle->IsSameDocument(), is_fragment_navigation,
       navigation_handle->HasCommitted() ? navigation_handle->GetPageTransition()
                                         : -1,
       navigation_handle->GetNetErrorCode(), jerror_description,
       // TODO(shaktisahu): Change default status to -1 after fixing
       // crbug/690041.
       navigation_handle->GetResponseHeaders()
           ? navigation_handle->GetResponseHeaders()->response_code()
           : 200);
 }
 
@@ skipping 88 matching lines @@
     // a base URL if there has been a loadUrl("javascript:...") after
     // loadDataWithBaseUrl.
     *url = base_url_of_last_started_data_url_.possibly_invalid_spec();
   }
 }
 
 bool RegisterWebContentsObserverProxy(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 }  // namespace content