Revert "[Android WebView] Send WebChromeClient.onReceivedTitle when navigating back"

This reverts commit 8099c53729618d970f1ccbeb06fab9511bb3ca81.

BUG=481570,494929

Review URL: https://codereview.chromium.org/1147193007

Cr-Commit-Position: refs/branch-heads/2357@{#450}
Cr-Branched-From: 59d4494849b405682265ed5d3f5164573b9a939b-refs/heads/master@{#323860}

5 files changed, 0 insertions, 43 deletions

diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java
index e8c4a5d..bf5af89 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java
@@ -41,9 +41,4 @@ public abstract class AwWebContentsDelegate extends WebContentsDelegateAndroid {
     @Override
     @CalledByNative
     public abstract void navigationStateChanged(int flags);
-
-    // Not an override, because WebContentsDelegateAndroid maps this call
-    // into onLoad{Started|Stopped}.
-    @CalledByNative
-    public abstract void loadingStateChanged();
 }
diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
index 0a9eca5..e8aebde 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java
@@ -271,11 +271,6 @@ class AwWebContentsDelegateAdapter extends AwWebContentsDelegate {
         }
     }
 
-    @Override
-    public void loadingStateChanged() {
-        mContentsClient.onReceivedTitle(mAwContents.getTitle());
-    }
-
     private static class GetDisplayNameTask extends AsyncTask<Void, Void, String[]> {
         final int mProcessId;
         final int mRenderId;
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
index 14f18b9..5a8c75d 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/NavigationHistoryTest.java
@@ -320,23 +320,4 @@ public class NavigationHistoryTest extends AwTestBase {
             }
         });
     }
-
-    // See http://crbug.com/481570
-    @SmallTest
-    public void testTitleUpdatedWhenGoingBack() throws Throwable {
-        final TestCallbackHelperContainer.OnPageFinishedHelper onPageFinishedHelper =
-                mContentsClient.getOnPageFinishedHelper();
-        NavigationHistory list = getNavigationHistory(mAwContents);
-        assertEquals(0, list.getEntryCount());
-
-        final String page1Url = addPage1ToServer(mWebServer);
-        final String page2Url = addPage2ToServer(mWebServer);
-
-        loadUrlSync(mAwContents, onPageFinishedHelper, page1Url);
-        loadUrlSync(mAwContents, onPageFinishedHelper, page2Url);
-        assertEquals(PAGE_2_TITLE, mContentsClient.getUpdatedTitle());
-        HistoryUtils.goBackSync(getInstrumentation(), mAwContents.getWebContents(),
-                onPageFinishedHelper);
-        assertEquals(PAGE_1_TITLE, mContentsClient.getUpdatedTitle());
-    }
 }
diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc
index b1ac9d4..d2a71e6 100644
--- a/android_webview/native/aw_web_contents_delegate.cc
+++ b/android_webview/native/aw_web_contents_delegate.cc
@@ -204,18 +204,6 @@ void AwWebContentsDelegate::ActivateContents(WebContents* contents) {
   }
 }
 
-void AwWebContentsDelegate::LoadingStateChanged(WebContents* source,
-                                                bool to_different_document) {
-  // Page title may have changed, need to inform the embedder.
-  // |source| may be null if loading has started.
-  JNIEnv* env = AttachCurrentThread();
-
-  ScopedJavaLocalRef<jobject> java_delegate = GetJavaDelegate(env);
-  if (java_delegate.obj()) {
-    Java_AwWebContentsDelegate_loadingStateChanged(env, java_delegate.obj());
-  }
-}
-
 void AwWebContentsDelegate::RequestMediaAccessPermission(
     WebContents* web_contents,
     const content::MediaStreamRequest& request,
diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h
index 031e29d..afc881b 100644
--- a/android_webview/native/aw_web_contents_delegate.h
+++ b/android_webview/native/aw_web_contents_delegate.h
@@ -50,8 +50,6 @@ class AwWebContentsDelegate
 
   void CloseContents(content::WebContents* source) override;
   void ActivateContents(content::WebContents* contents) override;
-  void LoadingStateChanged(content::WebContents* source,
-                           bool to_different_document) override;
   void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,