Remove incognito parameter from AwContents

It is always false and not planned to be supported

BUG=


Review URL: https://chromiumcodereview.appspot.com/11785011

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

4 files changed, 57 insertions, 448 deletions

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
index 89f477e..95335be 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.java
@@ -38,8 +38,6 @@ public class AndroidWebViewTestBase
         extends ActivityInstrumentationTestCase2<AndroidWebViewTestRunnerActivity> {
     protected static int WAIT_TIMEOUT_SECONDS = 15;
     private static final int CHECK_INTERVAL = 100;
-    protected static final boolean NORMAL_VIEW = false;
-    protected static final boolean INCOGNITO_VIEW = true;
 
     public AndroidWebViewTestBase() {
         super(AndroidWebViewTestRunnerActivity.class);
@@ -202,19 +200,18 @@ public class AndroidWebViewTestBase
         });
     }
 
-    protected AwTestContainerView createAwTestContainerView(final boolean incognito,
+    protected AwTestContainerView createAwTestContainerView(
             final AwContentsClient awContentsClient) {
-        return createAwTestContainerView(incognito, new AwTestContainerView(getActivity()),
+        return createAwTestContainerView(new AwTestContainerView(getActivity()),
                 awContentsClient);
     }
 
-    protected AwTestContainerView createAwTestContainerView(final boolean incognito,
+    protected AwTestContainerView createAwTestContainerView(
             final AwTestContainerView testContainerView,
             final AwContentsClient awContentsClient) {
         testContainerView.initialize(new AwContents(testContainerView,
                 testContainerView.getInternalAccessDelegate(),
-                awContentsClient, new ActivityNativeWindow(getActivity()),
-                incognito, false));
+                awContentsClient, new ActivityNativeWindow(getActivity()), false));
         getActivity().addView(testContainerView);
         testContainerView.requestFocus();
         return testContainerView;
@@ -222,19 +219,12 @@ public class AndroidWebViewTestBase
 
     protected AwTestContainerView createAwTestContainerViewOnMainSync(
             final AwContentsClient client) throws Exception {
-        return createAwTestContainerViewOnMainSync(NORMAL_VIEW, client);
-    }
-
-    protected AwTestContainerView createAwTestContainerViewOnMainSync(
-            final boolean incognito,
-            final AwContentsClient client) throws Exception {
         final AtomicReference<AwTestContainerView> testContainerView =
                 new AtomicReference<AwTestContainerView>();
-        final Context context = getActivity();
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                testContainerView.set(createAwTestContainerView(incognito, client));
+                testContainerView.set(createAwTestContainerView(client));
             }
         });
         return testContainerView.get();
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
index 9967345..5da6510 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/ArchiveTest.java
@@ -28,6 +28,7 @@ public class ArchiveTest extends AndroidWebViewTestBase {
 
     @Override
     protected void setUp() throws Exception {
+        super.setUp();
         mTestContainerView = createAwTestContainerViewOnMainSync(mContentsClient);
     }
 
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 78c270f..81c55a4 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -43,7 +43,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
     @UiThreadTest
     public void testCreateDestroy() throws Throwable {
         // NOTE this test runs on UI thread, so we cannot call any async methods.
-        createAwTestContainerView(false, mContentsClient).getAwContents().destroy();
+        createAwTestContainerView(mContentsClient).getAwContents().destroy();
     }
 
     private int callDocumentHasImagesSync(final AwContents awContents)
@@ -98,7 +98,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
     public void testClearCacheMemoryAndDisk() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
-                createAwTestContainerViewOnMainSync(false, contentClient);
+                createAwTestContainerViewOnMainSync(contentClient);
         final AwContents awContents = testContainer.getAwContents();
 
         TestWebServer webServer = null;
@@ -151,7 +151,7 @@ public class AwContentsTest extends AndroidWebViewTestBase {
     @Feature({"AndroidWebView"})
     public void testClearCacheInQuickSuccession() throws Throwable {
         final AwTestContainerView testContainer =
-                createAwTestContainerViewOnMainSync(false, new TestAwContentsClient());
+                createAwTestContainerViewOnMainSync(new TestAwContentsClient());
         final AwContents awContents = testContainer.getAwContents();
 
         runTestOnUiThread(new Runnable() {
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 e9117a9..803dc6b 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
@@ -1081,8 +1081,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptEnabledNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
+    public void testJavaScriptEnabledWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
@@ -1090,26 +1090,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptEnabledIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptEnabledBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptEnabledDynamicNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
+    public void testJavaScriptEnabledDynamicWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
@@ -1117,26 +1099,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptEnabledDynamicIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptEnabledDynamicBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testPluginsEnabledNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
+    public void testPluginsEnabledWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
@@ -1144,35 +1108,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testPluginsEnabledIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testPluginsEnabledBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testStandardFontFamilyNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testStandardFontFamilyIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
+    public void testStandardFontFamilyWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
@@ -1180,35 +1117,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testStandardFontFamilyBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testDefaultFontSizeNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testDefaultFontSizeIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testDefaultFontSizeBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testDefaultFontSizeWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
@@ -1221,7 +1131,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     @Feature({"AndroidWebView", "Preferences"})
     @SmallTest
     public void testLoadsImagesAutomaticallyWithCachedImage() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
+        ViewPair views = createViews();
         ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
         settings0.setJavaScriptEnabled(true);
         ContentSettings settings1 = getContentSettingsOnUiThread(views.getContents1());
@@ -1324,8 +1234,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testLoadsImagesAutomaticallyNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
+    public void testLoadsImagesAutomaticallyWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsLoadImagesAutomaticallyTestHelper(
                 views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
@@ -1335,48 +1245,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testLoadsImagesAutomaticallyIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
-            new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testLoadsImagesAutomaticallyBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
-            new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testDefaultTextEncodingNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testDefaultTextEncodingIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testDefaultTextEncodingBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testDefaultTextEncodingWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
@@ -1489,26 +1359,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testUserAgentStringNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testUserAgentStringIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testUserAgentStringBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testUserAgentStringWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
@@ -1551,17 +1403,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testDomStorageEnabledNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testDomStorageEnabledIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
+    public void testDomStorageEnabledWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
@@ -1569,39 +1412,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testDomStorageEnabledBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testUniversalAccessFromFilesNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
-                views.getClient0()),
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
-                views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testUniversalAccessFromFilesIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
-                views.getClient0()),
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
-                views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testUniversalAccessFromFilesBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testUniversalAccessFromFilesWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
                 views.getClient0()),
@@ -1630,30 +1442,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testFileAccessFromFilesIframeNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getContents0(), views.getClient0()),
-            new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testFileAccessFromFilesIframeIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getContents0(), views.getClient0()),
-            new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testFileAccessFromFilesIframeBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testFileAccessFromFilesIframeWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsFileAccessFromFilesIframeTestHelper(
                 views.getContents0(), views.getClient0()),
@@ -1663,8 +1453,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testFileAccessFromFilesXhrNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
+    public void testFileAccessFromFilesXhrWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
                 views.getClient0()),
@@ -1674,30 +1464,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testFileAccessFromFilesXhrIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
-                views.getClient0()),
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
-                views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testFileAccessFromFilesXhrBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
-                views.getClient0()),
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
-                views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testFileUrlAccessNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
+    public void testFileUrlAccessWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
             new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
@@ -1705,44 +1473,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testFileUrlAccessIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
-            new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testFileUrlAccessBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
-            new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testContentUrlAccessNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
-            new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testContentUrlAccessIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
-            new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testContentUrlAccessBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testContentUrlAccessWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
             new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
@@ -1772,30 +1504,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences", "Navigation"})
-    public void testContentUrlFromFileNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContents0(), views.getClient0(), 0),
-            new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContents1(), views.getClient1(), 1));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences", "Navigation"})
-    public void testContentUrlFromFileIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContents0(), views.getClient0(), 0),
-            new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContents1(), views.getClient1(), 1));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences", "Navigation"})
-    public void testContentUrlFromFileBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testContentUrlFromFileWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsContentUrlAccessFromFileTestHelper(
                     views.getContents0(), views.getClient0(), 0),
@@ -1874,7 +1584,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     public void testBlockNetworkLoadsWithHttpResources() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
-                createAwTestContainerViewOnMainSync(false, contentClient);
+                createAwTestContainerViewOnMainSync(contentClient);
         final AwContents awContents = testContainer.getAwContents();
         final ContentSettings contentSettings = getContentSettingsOnUiThread(awContents);
         final AwSettings awSettings = getAwSettingsOnUiThread(testContainer.getAwContents());
@@ -2017,17 +1727,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testLayoutAlgorithmNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsLayoutAlgorithmTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsLayoutAlgorithmTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testLayoutAlgorithmIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
+    public void testLayoutAlgorithmWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsLayoutAlgorithmTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsLayoutAlgorithmTestHelper(views.getContents1(), views.getClient1()));
@@ -2035,35 +1736,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testLayoutAlgorithmBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsLayoutAlgorithmTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsLayoutAlgorithmTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testTextZoomNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsTextZoomTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsTextZoomTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testTextZoomIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsTextZoomTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsTextZoomTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testTextZoomBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testTextZoomWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsTextZoomTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsTextZoomTestHelper(views.getContents1(), views.getClient1()));
@@ -2071,26 +1745,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptPopupsNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptPopupsIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        runPerViewSettingsTest(
-            new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0()),
-            new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1()));
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testJavaScriptPopupsBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testJavaScriptPopupsWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         runPerViewSettingsTest(
             new AwSettingsJavaScriptPopupsTestHelper(views.getContents0(), views.getClient0()),
             new AwSettingsJavaScriptPopupsTestHelper(views.getContents1(), views.getClient1()));
@@ -2101,7 +1757,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     public void testCacheMode() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
-                createAwTestContainerViewOnMainSync(false, contentClient);
+                createAwTestContainerViewOnMainSync(contentClient);
         final AwContents awContents = testContainer.getAwContents();
         final AwSettings awSettings = getAwSettingsOnUiThread(testContainer.getAwContents());
         clearCacheOnUiThread(awContents, true);
@@ -2150,7 +1806,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     public void testCacheModeWithBlockedNetworkLoads() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
-                createAwTestContainerViewOnMainSync(false, contentClient);
+                createAwTestContainerViewOnMainSync(contentClient);
         final AwContents awContents = testContainer.getAwContents();
         final AwSettings awSettings = getAwSettingsOnUiThread(testContainer.getAwContents());
         clearCacheOnUiThread(awContents, true);
@@ -2195,42 +1851,8 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences"})
-    public void testCacheModeNormal() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        TestWebServer webServer = null;
-        try {
-            webServer = new TestWebServer(false);
-            runPerViewSettingsTest(
-                    new AwSettingsCacheModeTestHelper(
-                            views.getContents0(), views.getClient0(), 0, webServer),
-                    new AwSettingsCacheModeTestHelper(
-                            views.getContents1(), views.getClient1(), 1, webServer));
-        } finally {
-            if (webServer != null) webServer.shutdown();
-        }
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testCacheModeIncognito() throws Throwable {
-        ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
-        TestWebServer webServer = null;
-        try {
-            webServer = new TestWebServer(false);
-            runPerViewSettingsTest(
-                    new AwSettingsCacheModeTestHelper(
-                            views.getContents0(), views.getClient0(), 0, webServer),
-                    new AwSettingsCacheModeTestHelper(
-                            views.getContents1(), views.getClient1(), 1, webServer));
-        } finally {
-            if (webServer != null) webServer.shutdown();
-        }
-    }
-
-    @SmallTest
-    @Feature({"AndroidWebView", "Preferences"})
-    public void testCacheModeBoth() throws Throwable {
-        ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
+    public void testCacheModeWithTwoViews() throws Throwable {
+        ViewPair views = createViews();
         TestWebServer webServer = null;
         try {
             webServer = new TestWebServer(false);
@@ -2301,7 +1923,7 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
     public void testAppCache() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
-                createAwTestContainerViewOnMainSync(false, contentClient);
+                createAwTestContainerViewOnMainSync(contentClient);
         final AwContents awContents = testContainer.getAwContents();
         final ContentSettings settings = getContentSettingsOnUiThread(awContents);
         settings.setJavaScriptEnabled(true);
@@ -2335,11 +1957,11 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
 
     @SmallTest
     @Feature({"AndroidWebView", "Preferences", "AppCache"})
-    public void testAppCacheNormal() throws Throwable {
+    public void testAppCacheWithTwoViews() throws Throwable {
         // We don't use the test helper here, because making sure that AppCache
         // is disabled takes a lot of time, so running through the usual drill
         // will take about 20 seconds.
-        ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
+        ViewPair views = createViews();
         ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
         settings0.setJavaScriptEnabled(true);
         settings0.setAppCachePath("whatever");
@@ -2470,17 +2092,13 @@ public class AwSettingsTest extends AndroidWebViewTestBase {
         helper1.ensureSettingHasInitialValue();
     }
 
-    private ViewPair createViews(
-            boolean firstIsIncognito,
-            boolean secondIsIncognito) throws Throwable {
+    private ViewPair createViews() throws Throwable {
         TestAwContentsClient client0 = new TestAwContentsClient();
         TestAwContentsClient client1 = new TestAwContentsClient();
         return new ViewPair(
-            createAwTestContainerViewOnMainSync(
-                firstIsIncognito, client0).getAwContents(),
+            createAwTestContainerViewOnMainSync(client0).getAwContents(),
             client0,
-            createAwTestContainerViewOnMainSync(
-                secondIsIncognito, client1).getAwContents(),
+            createAwTestContainerViewOnMainSync(client1).getAwContents(),
             client1);
     }