DO NOT COMMIT: Revert "Enable subframe FrameNavigationEntries by default."

android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java

Index: android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
index 979d105dabe31f33d14b0994e69de7607a23ad7c..4662c55864b6b4f3c2e15a9479f33ed802a79c18 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadDataWithBaseUrlTest.java
@@ -259,8 +259,8 @@ public class LoadDataWithBaseUrlTest extends AwTestBase {
             assertEquals(page2Title, getTitleOnUiThread(mAwContents));
 
             HistoryUtils.goBackSync(getInstrumentation(), mWebContents, onPageFinishedHelper);
-            // The title of first page loaded with loadDataWithBaseUrl.
-            assertEquals(page1Title, getTitleOnUiThread(mAwContents));
+            // The title of the 'about.html' specified via historyUrl.
+            assertEquals(CommonResources.ABOUT_TITLE, getTitleOnUiThread(mAwContents));
         } finally {
             webServer.shutdown();
         }