[Android] Remove workarounds in AwSettingsTest.

Remove workarounds that were depending on https://codereview.chromium.org/11030051/

R=benm@chromium.org
BUG=154271

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162985 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 10 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index 07b7998..e5a5479 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -677,25 +677,15 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
         @Override
         protected void doEnsureSettingHasValue(Boolean value) throws Throwable {
-            // TODO(mnaganov): Remove after https://codereview.chromium.org/11030051 lands.
-            final String pseudo_error_page = "about:blank";
-            loadUrlSync(pseudo_error_page);
             // Use query parameters to avoid hitting a cached page.
             String fileUrl = UrlUtils.getTestFileUrl("webview/hello_world.html?id=" + mIndex);
             mIndex += 2;
-            // TODO(mnaganov): Remove after https://codereview.chromium.org/11030051 lands.
-            loadUrlSync(fileUrl);
-            assertEquals(value == ENABLED ? ACCESS_GRANTED_TITLE : pseudo_error_page,
-                    getTitleOnUiThread());
-            // TODO(mnaganov): Uncomment after https://codereview.chromium.org/11030051 lands.
-            /*
             if (value == ENABLED) {
                 loadUrlSync(fileUrl);
                 assertEquals(ACCESS_GRANTED_TITLE, getTitleOnUiThread());
             } else {
                 loadUrlSyncAndExpectError(fileUrl);
             }
-            */
         }
 
         private int mIndex;