[android_webview] Use AwContents loadUrl method instead of ContentViewCore.

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

 // Copyright (c) 2012 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.
 
 package org.chromium.android_webview.test;
 
 import android.content.Context;
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Pair;
 
 import org.chromium.android_webview.AndroidProtocolHandler;
 import org.chromium.android_webview.AwContents;
 import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.ImagePageGenerator;
 import org.chromium.android_webview.test.util.TestWebServer;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.TestFileUtil;
 import org.chromium.base.test.util.UrlUtils;
@@ skipping 22 matching lines @@
     private static final boolean ENABLED = true;
     private static final boolean DISABLED = false;
 
     /**
      * A helper class for testing a particular preference from ContentSettings.
      * The generic type T is the type of the setting. Usually, to test an
      * effect of the preference, JS code is executed that sets document's title.
      * In this case, requiresJsEnabled constructor argument must be set to true.
      */
     abstract class AwSettingsTestHelper<T> {
-        protected final ContentViewCore mContentViewCore;
+        protected final AwContents mAwContents;
         protected final TestAwContentsClient mContentViewClient;
         protected final ContentSettings mContentSettings;
 
-        AwSettingsTestHelper(ContentViewCore contentViewCore,
+        AwSettingsTestHelper(AwContents awContents,
                              TestAwContentsClient contentViewClient,
                              boolean requiresJsEnabled) throws Throwable {
-            mContentViewCore = contentViewCore;
+            mAwContents = awContents;
             mContentViewClient = contentViewClient;
-            mContentSettings = getContentSettingsOnUiThread(mContentViewCore);
+            mContentSettings = getContentSettingsOnUiThread(mAwContents);
             if (requiresJsEnabled) {
                 mContentSettings.setJavaScriptEnabled(true);
             }
         }
 
         void ensureSettingHasAlteredValue() throws Throwable {
             ensureSettingHasValue(getAlteredValue());
         }
 
         void ensureSettingHasInitialValue() throws Throwable {
@@ skipping 12 matching lines @@
 
         protected abstract T getInitialValue();
 
         protected abstract T getCurrentValue();
 
         protected abstract void setCurrentValue(T value);
 
         protected abstract void doEnsureSettingHasValue(T value) throws Throwable;
 
         protected String getTitleOnUiThread() throws Throwable {
-            return AwSettingsTest.this.getTitleOnUiThread(mContentViewCore);
+            return AwSettingsTest.this.getTitleOnUiThread(mAwContents);
         }
 
         protected void loadDataSync(String data) throws Throwable {
             AwSettingsTest.this.loadDataSync(
-                mContentViewCore,
+                mAwContents,
                 mContentViewClient.getOnPageFinishedHelper(),
                 data,
                 "text/html",
                 false);
         }
 
         protected void loadUrlSync(String url) throws Throwable {
             AwSettingsTest.this.loadUrlSync(
-                mContentViewCore,
+                mAwContents,
                 mContentViewClient.getOnPageFinishedHelper(),
                 url);
         }
 
         protected void loadUrlSyncAndExpectError(String url) throws Throwable {
             AwSettingsTest.this.loadUrlSyncAndExpectError(
-                mContentViewCore,
+                mAwContents,
                 mContentViewClient.getOnPageFinishedHelper(),
                 mContentViewClient.getOnReceivedErrorHelper(),
                 url);
         }
 
         private void ensureSettingHasValue(T value) throws Throwable {
             assertEquals(value, getCurrentValue());
             doEnsureSettingHasValue(value);
         }
     }
 
     class AwSettingsJavaScriptTestHelper extends AwSettingsTestHelper<Boolean> {
         private static final String JS_ENABLED_STRING = "JS Enabled";
         private static final String JS_DISABLED_STRING = "JS Disabled";
 
-        AwSettingsJavaScriptTestHelper(ContentViewCore contentViewCore,
+        AwSettingsJavaScriptTestHelper(AwContents awContents,
                                        TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, false);
+            super(awContents, contentViewClient, false);
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return ENABLED;
         }
 
         @Override
         protected Boolean getInitialValue() {
             return DISABLED;
@@ skipping 21 matching lines @@
             return "<html><head><title>" + JS_DISABLED_STRING + "</title>"
                     + "</head><body onload=\"document.title='" + JS_ENABLED_STRING
                     + "';\"></body></html>";
         }
     }
 
     // In contrast to AwSettingsJavaScriptTestHelper, doesn't reload the page when testing
     // JavaScript state.
     class AwSettingsJavaScriptDynamicTestHelper extends AwSettingsJavaScriptTestHelper {
         AwSettingsJavaScriptDynamicTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient);
+            super(awContents, contentViewClient);
             // Load the page.
             super.doEnsureSettingHasValue(getInitialValue());
         }
 
         @Override
         protected void doEnsureSettingHasValue(Boolean value) throws Throwable {
             String oldTitle = getTitleOnUiThread();
             String newTitle = oldTitle + "_modified";
             executeJavaScriptAndWaitForResult(
-                mContentViewCore, mContentViewClient, getScript(newTitle));
+                mAwContents, mContentViewClient, getScript(newTitle));
             assertEquals(value == ENABLED ? newTitle : oldTitle, getTitleOnUiThread());
         }
 
         private String getScript(String title) {
             return "document.title='" + title + "';";
         }
     }
 
     class AwSettingsPluginsTestHelper extends AwSettingsTestHelper<Boolean> {
         private static final String PLUGINS_ENABLED_STRING = "Embed";
         private static final String PLUGINS_DISABLED_STRING = "NoEmbed";
 
-        AwSettingsPluginsTestHelper(ContentViewCore contentViewCore,
+        AwSettingsPluginsTestHelper(AwContents awContents,
                                     TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return ENABLED;
         }
 
         @Override
         protected Boolean getInitialValue() {
             return DISABLED;
@@ skipping 18 matching lines @@
         }
 
         private String getData() {
             return "<html><body onload=\"document.title = document.body.innerText;\">"
                     + "<noembed>No</noembed><span>Embed</span></body></html>";
         }
     }
 
     class AwSettingsStandardFontFamilyTestHelper extends AwSettingsTestHelper<String> {
         AwSettingsStandardFontFamilyTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
         }
 
         @Override
         protected String getAlteredValue() {
             return "cursive";
         }
 
         @Override
         protected String getInitialValue() {
             return "sans-serif";
@@ skipping 17 matching lines @@
 
         private String getData() {
             return "<html><body onload=\"document.title = " +
                     "getComputedStyle(document.body).getPropertyValue('font-family');\">"
                     + "</body></html>";
         }
     }
 
     class AwSettingsDefaultFontSizeTestHelper extends AwSettingsTestHelper<Integer> {
         AwSettingsDefaultFontSizeTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
         }
 
         @Override
         protected Integer getAlteredValue() {
             return 42;
         }
 
         @Override
         protected Integer getInitialValue() {
             return 16;
@@ skipping 19 matching lines @@
             return "<html><body onload=\"document.title = " +
                     "getComputedStyle(document.body).getPropertyValue('font-size');\">"
                     + "</body></html>";
         }
     }
 
     class AwSettingsLoadImagesAutomaticallyTestHelper extends AwSettingsTestHelper<Boolean> {
         private ImagePageGenerator mGenerator;
 
         AwSettingsLoadImagesAutomaticallyTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient,
                 ImagePageGenerator generator) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
             mGenerator = generator;
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return DISABLED;
         }
 
         @Override
         protected Boolean getInitialValue() {
@@ skipping 15 matching lines @@
             loadDataSync(mGenerator.getPageSource());
             assertEquals(value == ENABLED ?
                          ImagePageGenerator.IMAGE_LOADED_STRING :
                          ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
                          getTitleOnUiThread());
         }
     }
 
     class AwSettingsDefaultTextEncodingTestHelper extends AwSettingsTestHelper<String> {
         AwSettingsDefaultTextEncodingTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
         }
 
         @Override
         protected String getAlteredValue() {
             return "utf-8";
         }
 
         @Override
         protected String getInitialValue() {
             return "Latin-1";
@@ skipping 19 matching lines @@
             return "<html><body onload='document.title=document.defaultCharset'></body></html>";
         }
     }
 
     class AwSettingsUserAgentStringTestHelper extends AwSettingsTestHelper<String> {
         private final String mDefaultUa;
         private static final String DEFAULT_UA = "";
         private static final String CUSTOM_UA = "ChromeViewTest";
 
         AwSettingsUserAgentStringTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
             mDefaultUa = mContentSettings.getUserAgentString();
         }
 
         @Override
         protected String getAlteredValue() {
             return CUSTOM_UA;
         }
 
         @Override
         protected String getInitialValue() {
@@ skipping 27 matching lines @@
         private String getData() {
             return "<html><body onload='document.title=navigator.userAgent'></body></html>";
         }
     }
 
     class AwSettingsDomStorageEnabledTestHelper extends AwSettingsTestHelper<Boolean> {
         private static final String NO_LOCAL_STORAGE = "No localStorage";
         private static final String HAS_LOCAL_STORAGE = "Has localStorage";
 
         AwSettingsDomStorageEnabledTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return ENABLED;
         }
 
         @Override
         protected Boolean getInitialValue() {
             return DISABLED;
@@ skipping 19 matching lines @@
                 getTitleOnUiThread());
         }
     }
 
     class AwSettingsUniversalAccessFromFilesTestHelper extends AwSettingsTestHelper<Boolean> {
         // TODO(mnaganov): Change to "Exception" once
         // https://bugs.webkit.org/show_bug.cgi?id=43504 is fixed.
         private static final String ACCESS_DENIED_TITLE = "undefined";
 
         AwSettingsUniversalAccessFromFilesTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
             mIframeContainerUrl = UrlUtils.getTestFileUrl("webview/iframe_access.html");
             mIframeUrl = UrlUtils.getTestFileUrl("webview/hello_world.html");
             // The value of the setting depends on the SDK version.
             mContentSettings.setAllowUniversalAccessFromFileURLs(false);
             // If universal access is true, the value of file access doesn't
             // matter. While if universal access is false, having file access
             // enabled will allow file loading.
             mContentSettings.setAllowFileAccessFromFileURLs(false);
         }
 
@@ skipping 28 matching lines @@
         private final String mIframeContainerUrl;
         private final String mIframeUrl;
     }
 
     class AwSettingsFileAccessFromFilesIframeTestHelper extends AwSettingsTestHelper<Boolean> {
         // TODO(mnaganov): Change to "Exception" once
         // https://bugs.webkit.org/show_bug.cgi?id=43504 is fixed.
         private static final String ACCESS_DENIED_TITLE = "undefined";
 
         AwSettingsFileAccessFromFilesIframeTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
             mIframeContainerUrl = UrlUtils.getTestFileUrl("webview/iframe_access.html");
             mIframeUrl = UrlUtils.getTestFileUrl("webview/hello_world.html");
             mContentSettings.setAllowUniversalAccessFromFileURLs(false);
             // The value of the setting depends on the SDK version.
             mContentSettings.setAllowFileAccessFromFileURLs(false);
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return ENABLED;
@@ skipping 24 matching lines @@
 
         private final String mIframeContainerUrl;
         private final String mIframeUrl;
     }
 
     class AwSettingsFileAccessFromFilesXhrTestHelper extends AwSettingsTestHelper<Boolean> {
         private static final String ACCESS_GRANTED_TITLE = "Hello, World!";
         private static final String ACCESS_DENIED_TITLE = "Exception";
 
         AwSettingsFileAccessFromFilesXhrTestHelper(
-                ContentViewCore contentViewCore,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient) throws Throwable {
-            super(contentViewCore, contentViewClient, true);
+            super(awContents, contentViewClient, true);
             mXhrContainerUrl = UrlUtils.getTestFileUrl("webview/xhr_access.html");
             mContentSettings.setAllowUniversalAccessFromFileURLs(false);
             // The value of the setting depends on the SDK version.
             mContentSettings.setAllowFileAccessFromFileURLs(false);
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return ENABLED;
         }
@@ skipping 22 matching lines @@
         }
 
         private final String mXhrContainerUrl;
     }
 
     // A helper super class for test cases that need to access AwSettings.
     abstract class AwSettingsWithSettingsTestHelper<T> extends AwSettingsTestHelper<T> {
         protected AwSettings mAwSettings;
 
         AwSettingsWithSettingsTestHelper(
-                AwTestContainerView containerView,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient,
                 boolean requiresJsEnabled) throws Throwable {
-            super(containerView.getContentViewCore(), contentViewClient, requiresJsEnabled);
-            mAwSettings =
-                    AwSettingsTest.this.getAwSettingsOnUiThread(containerView.getAwContents());
+            super(awContents, contentViewClient, requiresJsEnabled);
+            mAwSettings = AwSettingsTest.this.getAwSettingsOnUiThread(awContents);
         }
     }
 
     class AwSettingsFileUrlAccessTestHelper extends AwSettingsWithSettingsTestHelper<Boolean> {
         private static final String ACCESS_GRANTED_TITLE = "Hello, World!";
 
         AwSettingsFileUrlAccessTestHelper(
-                AwTestContainerView containerView,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient,
                 int startIndex) throws Throwable {
-            super(containerView, contentViewClient, true);
+            super(awContents, contentViewClient, true);
             mIndex = startIndex;
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return DISABLED;
         }
 
         @Override
         protected Boolean getInitialValue() {
@@ skipping 32 matching lines @@
             }
             */
         }
 
         private int mIndex;
     }
 
     class AwSettingsContentUrlAccessTestHelper extends AwSettingsWithSettingsTestHelper<Boolean> {
 
         AwSettingsContentUrlAccessTestHelper(
-                AwTestContainerView containerView,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient,
                 int index) throws Throwable {
-            super(containerView, contentViewClient, true);
+            super(awContents, contentViewClient, true);
             mTarget = "content_access_" + index;
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return DISABLED;
         }
 
         @Override
         protected Boolean getInitialValue() {
@@ skipping 22 matching lines @@
         }
 
         private final String mTarget;
     }
 
     class AwSettingsContentUrlAccessFromFileTestHelper
             extends AwSettingsWithSettingsTestHelper<Boolean> {
         private static final String TARGET = "content_from_file";
 
         AwSettingsContentUrlAccessFromFileTestHelper(
-                AwTestContainerView containerView,
+                AwContents awContents,
                 TestAwContentsClient contentViewClient,
                 int index) throws Throwable {
-            super(containerView, contentViewClient, true);
+            super(awContents, contentViewClient, true);
             mIndex = index;
             mTempDir = getInstrumentation().getTargetContext().getCacheDir().getPath();
         }
 
         @Override
         protected Boolean getAlteredValue() {
             return DISABLED;
         }
 
         @Override
@@ skipping 48 matching lines @@
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testJavaScriptDisabledByDefault() throws Throwable {
         final String JS_ENABLED_STRING = "JS has run";
         final String JS_DISABLED_STRING = "JS has not run";
         final String TEST_PAGE_HTML =
                 "<html><head><title>" + JS_DISABLED_STRING + "</title>"
                 + "</head><body onload=\"document.title='" + JS_ENABLED_STRING
                 + "';\"></body></html>";
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
         loadDataSync(
-            contentView,
+            awContents,
             contentClient.getOnPageFinishedHelper(),
             TEST_PAGE_HTML,
             "text/html",
             false);
-        assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(contentView));
+        assertEquals(JS_DISABLED_STRING, getTitleOnUiThread(awContents));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testJavaScriptEnabledNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testJavaScriptEnabledIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testJavaScriptEnabledBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsJavaScriptTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsJavaScriptTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsJavaScriptTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsJavaScriptTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testJavaScriptEnabledDynamicNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testJavaScriptEnabledDynamicIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testJavaScriptEnabledDynamicBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsJavaScriptDynamicTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsJavaScriptDynamicTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsJavaScriptDynamicTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsJavaScriptDynamicTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testPluginsEnabledNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testPluginsEnabledIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testPluginsEnabledBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsPluginsTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsPluginsTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsPluginsTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsPluginsTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testStandardFontFamilyNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testStandardFontFamilyIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testStandardFontFamilyBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsStandardFontFamilyTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsStandardFontFamilyTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsStandardFontFamilyTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsStandardFontFamilyTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDefaultFontSizeNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDefaultFontSizeIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDefaultFontSizeBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDefaultFontSizeTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDefaultFontSizeTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDefaultFontSizeTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDefaultFontSizeTestHelper(views.getContents1(), views.getClient1()));
     }
 
     // The test verifies that disabling images loading by setting
     // setLoadsImagesAutomatically to false doesn't prevent images already
     // contained in the memory cache to be displayed.  The cache is shared among
     // all views, so the image can be put there by another view.
     @Feature({"Android-WebView", "Preferences"})
     @SmallTest
     public void testLoadsImagesAutomaticallyWithCachedImage() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
-        ContentSettings settings0 = getContentSettingsOnUiThread(views.getView0());
+        ContentSettings settings0 = getContentSettingsOnUiThread(views.getContents0());
         settings0.setJavaScriptEnabled(true);
-        ContentSettings settings1 = getContentSettingsOnUiThread(views.getView1());
+        ContentSettings settings1 = getContentSettingsOnUiThread(views.getContents1());
         settings1.setJavaScriptEnabled(true);
         ImagePageGenerator generator = new ImagePageGenerator(0, false);
 
         // First disable images loading and verify it.
         settings0.setLoadsImagesAutomatically(false);
         settings1.setLoadsImagesAutomatically(false);
-        loadDataSync(views.getView0(),
+        loadDataSync(views.getContents0(),
                      views.getClient0().getOnPageFinishedHelper(),
                      generator.getPageSource(),
                      "text/html", false);
-        loadDataSync(views.getView1(),
+        loadDataSync(views.getContents1(),
                      views.getClient1().getOnPageFinishedHelper(),
                      generator.getPageSource(),
                      "text/html", false);
         assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
-                getTitleOnUiThread(views.getView0()));
+                getTitleOnUiThread(views.getContents0()));
         assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
-                getTitleOnUiThread(views.getView1()));
+                getTitleOnUiThread(views.getContents1()));
 
         // Now enable images loading only for view 0.
         settings0.setLoadsImagesAutomatically(true);
-        loadDataSync(views.getView0(),
+        loadDataSync(views.getContents0(),
                      views.getClient0().getOnPageFinishedHelper(),
                      generator.getPageSource(),
                      "text/html", false);
-        loadDataSync(views.getView1(),
+        loadDataSync(views.getContents1(),
                      views.getClient1().getOnPageFinishedHelper(),
                      generator.getPageSource(),
                      "text/html", false);
 
         // Once the image has been cached by contentView0, it is available to contentView1.
-        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
-        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
+        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+                getTitleOnUiThread(views.getContents0()));
+        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+                getTitleOnUiThread(views.getContents1()));
         ImagePageGenerator generator1 = new ImagePageGenerator(1, false);
 
         // This is a new image. view 1 can't load it.
-        loadDataSync(views.getView1(),
+        loadDataSync(views.getContents1(),
                      views.getClient1().getOnPageFinishedHelper(),
                      generator1.getPageSource(),
                      "text/html", false);
         assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
-                     getTitleOnUiThread(views.getView1()));
-        loadDataSync(views.getView0(),
+                     getTitleOnUiThread(views.getContents1()));
+        loadDataSync(views.getContents0(),
                      views.getClient0().getOnPageFinishedHelper(),
                      generator1.getPageSource(),
                      "text/html", false);
-        loadDataSync(views.getView1(),
+        loadDataSync(views.getContents1(),
                      views.getClient1().getOnPageFinishedHelper(),
                      generator1.getPageSource(),
                      "text/html", false);
 
         // Once the image has been cached by contentViewCore0, it is available to contentViewCore1.
-        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView0()));
-        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(views.getView1()));
+        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+                getTitleOnUiThread(views.getContents0()));
+        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING,
+                getTitleOnUiThread(views.getContents1()));
     }
 
     // The test verifies that after changing the LoadsImagesAutomatically
     // setting value from false to true previously skipped images are
     // automatically loaded.
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testLoadsImagesAutomaticallyNoPageReload() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
         CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
-        ContentSettings settings = getContentSettingsOnUiThread(contentView);
+        ContentSettings settings = getContentSettingsOnUiThread(awContents);
         settings.setJavaScriptEnabled(true);
         ImagePageGenerator generator = new ImagePageGenerator(0, false);
         settings.setLoadsImagesAutomatically(false);
-        loadDataSync(contentView,
+        loadDataSync(awContents,
                      contentClient.getOnPageFinishedHelper(),
                      generator.getPageSource(),
                      "text/html", false);
         assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
-                getTitleOnUiThread(contentView));
+                getTitleOnUiThread(awContents));
         settings.setLoadsImagesAutomatically(true);
         assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 try {
                     return !ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
-                            getTitleOnUiThread(contentView));
+                            getTitleOnUiThread(awContents));
                 } catch (Throwable t) {
                     t.printStackTrace();
                     fail("Failed to getTitleOnUiThread: " + t.toString());
                     return false;
                 }
             }
         }, TEST_TIMEOUT, CHECK_INTERVAL));
-        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
+        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testLoadsImagesAutomaticallyNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
             new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+                views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
             new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+                views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testLoadsImagesAutomaticallyIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
             new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+                views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
             new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+                views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testLoadsImagesAutomaticallyBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
             new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getView0(), views.getClient0(), new ImagePageGenerator(0, true)),
+                views.getContents0(), views.getClient0(), new ImagePageGenerator(0, true)),
             new AwSettingsLoadImagesAutomaticallyTestHelper(
-                views.getView1(), views.getClient1(), new ImagePageGenerator(1, true)));
+                views.getContents1(), views.getClient1(), new ImagePageGenerator(1, true)));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDefaultTextEncodingNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDefaultTextEncodingIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDefaultTextEncodingBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDefaultTextEncodingTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDefaultTextEncodingTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDefaultTextEncodingTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDefaultTextEncodingTestHelper(views.getContents1(), views.getClient1()));
     }
 
     // The test verifies that the default user agent string follows the format
     // defined in Android CTS tests:
     //
     // Mozilla/5.0 (Linux;[ U;] Android <version>;[ <language>-<country>;]
     // [<devicemodel>;] Build/<buildID>) AppleWebKit/<major>.<minor> (KHTML, like Gecko)
     // Version/<major>.<minor>[ Mobile] Safari/<major>.<minor>
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUserAgentStringDefault() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
-        ContentSettings settings = getContentSettingsOnUiThread(contentView);
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        ContentSettings settings = getContentSettingsOnUiThread(awContents);
         final String actualUserAgentString = settings.getUserAgentString();
         final String patternString =
                 "Mozilla/5\\.0 \\(Linux;( U;)? Android ([^;]+);( (\\w+)-(\\w+);)?" +
                 "\\s?(.*)\\sBuild/(.+)\\) AppleWebKit/(\\d+)\\.(\\d+) \\(KHTML, like Gecko\\) " +
                 "Version/\\d+\\.\\d+( Mobile)? Safari/(\\d+)\\.(\\d+)";
         final Pattern userAgentExpr = Pattern.compile(patternString);
         Matcher patternMatcher = userAgentExpr.matcher(actualUserAgentString);
         assertTrue(String.format("User agent string did not match expected pattern. \nExpected " +
                         "pattern:\n%s\nActual:\n%s", patternString, actualUserAgentString),
                         patternMatcher.find());
         // No country-language code token.
         assertEquals(null, patternMatcher.group(3));
         if ("REL".equals(Build.VERSION.CODENAME)) {
             // Model is only added in release builds
             assertEquals(Build.MODEL, patternMatcher.group(6));
             // Release version is valid only in release builds
             assertEquals(Build.VERSION.RELEASE, patternMatcher.group(2));
         }
         assertEquals(Build.ID, patternMatcher.group(7));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUserAgentStringOverride() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
-        ContentSettings settings = getContentSettingsOnUiThread(contentView);
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        ContentSettings settings = getContentSettingsOnUiThread(awContents);
         final String defaultUserAgentString = settings.getUserAgentString();
 
         // Check that an attempt to reset the default UA string has no effect.
         settings.setUserAgentString(null);
         assertEquals(defaultUserAgentString, settings.getUserAgentString());
         settings.setUserAgentString("");
         assertEquals(defaultUserAgentString, settings.getUserAgentString());
 
         // Check that we can also set the default value.
         settings.setUserAgentString(defaultUserAgentString);
         assertEquals(defaultUserAgentString, settings.getUserAgentString());
 
         // Set a custom UA string, verify that it can be reset back to default.
         final String customUserAgentString = "ContentSettingsTest";
         settings.setUserAgentString(customUserAgentString);
         assertEquals(customUserAgentString, settings.getUserAgentString());
         settings.setUserAgentString(null);
         assertEquals(defaultUserAgentString, settings.getUserAgentString());
     }
 
     // Verify that the current UA override setting has a priority over UA
     // overrides in navigation history entries.
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUserAgentStringOverrideForHistory() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        final ContentViewCore contentView = testContainerView.getContentViewCore();
         CallbackHelper onPageFinishedHelper = contentClient.getOnPageFinishedHelper();
-        ContentSettings settings = getContentSettingsOnUiThread(contentView);
+        ContentSettings settings = getContentSettingsOnUiThread(awContents);
         settings.setJavaScriptEnabled(true);
         final String defaultUserAgentString = settings.getUserAgentString();
         final String customUserAgentString = "ContentSettingsTest";
         // We are using different page titles to make sure that we are really
         // going back and forward between them.
         final String pageTemplate =
                 "<html><head><title>%s</title></head>" +
                 "<body onload='document.title+=navigator.userAgent'></body>" +
                 "</html>";
         final String page1Title = "Page1";
         final String page2Title = "Page2";
         final String page1 = String.format(pageTemplate, page1Title);
         final String page2 = String.format(pageTemplate, page2Title);
         settings.setUserAgentString(customUserAgentString);
         loadDataSync(
-            contentView, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
-        assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(contentView));
+            awContents, contentClient.getOnPageFinishedHelper(), page1, "text/html", false);
+        assertEquals(page1Title + customUserAgentString, getTitleOnUiThread(awContents));
         loadDataSync(
-            contentView, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
-        assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
+            awContents, contentClient.getOnPageFinishedHelper(), page2, "text/html", false);
+        assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
         settings.setUserAgentString(null);
         // Must not cause any changes until the next page loading.
-        assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(contentView));
+        assertEquals(page2Title + customUserAgentString, getTitleOnUiThread(awContents));
         HistoryUtils.goBackSync(getInstrumentation(), contentView, onPageFinishedHelper);
-        assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(contentView));
+        assertEquals(page1Title + defaultUserAgentString, getTitleOnUiThread(awContents));
         HistoryUtils.goForwardSync(getInstrumentation(), contentView,
                                    onPageFinishedHelper);
-        assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(contentView));
+        assertEquals(page2Title + defaultUserAgentString, getTitleOnUiThread(awContents));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUserAgentStringNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUserAgentStringIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUserAgentStringBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsUserAgentStringTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsUserAgentStringTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsUserAgentStringTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsUserAgentStringTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDomStorageEnabledNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDomStorageEnabledIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testDomStorageEnabledBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsDomStorageEnabledTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsDomStorageEnabledTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsDomStorageEnabledTestHelper(views.getContents0(), views.getClient0()),
+            new AwSettingsDomStorageEnabledTestHelper(views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUniversalAccessFromFilesNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+                views.getClient0()),
+            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+                views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUniversalAccessFromFilesIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+                views.getClient0()),
+            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+                views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testUniversalAccessFromFilesBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsUniversalAccessFromFilesTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents0(),
+                views.getClient0()),
+            new AwSettingsUniversalAccessFromFilesTestHelper(views.getContents1(),
+                views.getClient1()));
     }
 
     // This test verifies that local image resources can be loaded from file:
     // URLs regardless of file access state.
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileAccessFromFilesImage() throws Throwable {
         final String imageContainerUrl = UrlUtils.getTestFileUrl("webview/image_access.html");
         final String imageHeight = "16";
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
-        ContentSettings settings = getContentSettingsOnUiThread(contentView);
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        ContentSettings settings = getContentSettingsOnUiThread(awContents);
         settings.setJavaScriptEnabled(true);
         settings.setAllowUniversalAccessFromFileURLs(false);
         settings.setAllowFileAccessFromFileURLs(false);
-        loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
-        assertEquals(imageHeight, getTitleOnUiThread(contentView));
+        loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), imageContainerUrl);
+        assertEquals(imageHeight, getTitleOnUiThread(awContents));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileAccessFromFilesIframeNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
             new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getView0(), views.getClient0()),
+                views.getContents0(), views.getClient0()),
             new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getView1(), views.getClient1()));
+                views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileAccessFromFilesIframeIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
             new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getView0(), views.getClient0()),
+                views.getContents0(), views.getClient0()),
             new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getView1(), views.getClient1()));
+                views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileAccessFromFilesIframeBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
             new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getView0(), views.getClient0()),
+                views.getContents0(), views.getClient0()),
             new AwSettingsFileAccessFromFilesIframeTestHelper(
-                views.getView1(), views.getClient1()));
+                views.getContents1(), views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileAccessFromFilesXhrNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+                views.getClient0()),
+            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+                views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileAccessFromFilesXhrIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+                views.getClient0()),
+            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+                views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileAccessFromFilesXhrBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView0(), views.getClient0()),
-            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getView1(), views.getClient1()));
+            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents0(),
+                views.getClient0()),
+            new AwSettingsFileAccessFromFilesXhrTestHelper(views.getContents1(),
+                views.getClient1()));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileUrlAccessNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
-            new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+            new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+            new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileUrlAccessIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
-            new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+            new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+            new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testFileUrlAccessBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsFileUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
-            new AwSettingsFileUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+            new AwSettingsFileUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+            new AwSettingsFileUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testContentUrlAccessNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
-            new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+            new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+            new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testContentUrlAccessIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
-            new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+            new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+            new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testContentUrlAccessBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
-            new AwSettingsContentUrlAccessTestHelper(views.getContainer0(), views.getClient0(), 0),
-            new AwSettingsContentUrlAccessTestHelper(views.getContainer1(), views.getClient1(), 1));
+            new AwSettingsContentUrlAccessTestHelper(views.getContents0(), views.getClient0(), 0),
+            new AwSettingsContentUrlAccessTestHelper(views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences", "Navigation"})
     public void testBlockingContentUrlsFromDataUrls() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
         final String target = "content_from_data";
         final String page = "<html><body>" +
                 "<img src=\"" +
                 createContentUrl(target) + "\">" +
                 "</body></html>";
         resetResourceRequestCountInContentProvider(target);
         loadDataSync(
-            contentView,
+            awContents,
             contentClient.getOnPageFinishedHelper(),
             page,
             "text/html",
             false);
         ensureResourceRequestCountInContentProvider(target, 0);
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences", "Navigation"})
     public void testContentUrlFromFileNormal() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, NORMAL_VIEW);
         runPerViewSettingsTest(
             new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContainer0(), views.getClient0(), 0),
+                    views.getContents0(), views.getClient0(), 0),
             new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContainer1(), views.getClient1(), 1));
+                    views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences", "Navigation"})
     public void testContentUrlFromFileIncognito() throws Throwable {
         ViewPair views = createViews(INCOGNITO_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
             new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContainer0(), views.getClient0(), 0),
+                    views.getContents0(), views.getClient0(), 0),
             new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContainer1(), views.getClient1(), 1));
+                    views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences", "Navigation"})
     public void testContentUrlFromFileBoth() throws Throwable {
         ViewPair views = createViews(NORMAL_VIEW, INCOGNITO_VIEW);
         runPerViewSettingsTest(
             new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContainer0(), views.getClient0(), 0),
+                    views.getContents0(), views.getClient0(), 0),
             new AwSettingsContentUrlAccessFromFileTestHelper(
-                    views.getContainer1(), views.getClient1(), 1));
+                    views.getContents1(), views.getClient1(), 1));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testBlockNetworkImagesDoesNotBlockDataUrlImage() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
-        final ContentSettings settings = getContentSettingsOnUiThread(contentView);
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        final ContentSettings settings = getContentSettingsOnUiThread(awContents);
         ImagePageGenerator generator = new ImagePageGenerator(0, false);
 
         settings.setJavaScriptEnabled(true);
         settings.setImagesEnabled(false);
-        loadDataSync(contentView,
+        loadDataSync(awContents,
                      contentClient.getOnPageFinishedHelper(),
                      generator.getPageSource(),
                      "text/html",
                      false);
-        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(contentView));
+        assertEquals(ImagePageGenerator.IMAGE_LOADED_STRING, getTitleOnUiThread(awContents));
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testBlockNetworkImagesBlocksNetworkImageAndReloadInPlace() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
-        final ContentSettings settings = getContentSettingsOnUiThread(contentView);
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        final ContentSettings settings = getContentSettingsOnUiThread(awContents);
         settings.setJavaScriptEnabled(true);
         ImagePageGenerator generator = new ImagePageGenerator(0, false);
 
         TestWebServer webServer = null;
         try {
             webServer = new TestWebServer(false);
             final String imagePath = "/image.png";
             webServer.setResponseBase64(imagePath, generator.getImageSourceNoAdvance(),
                     CommonResources.getImagePngHeaders(false));
 
             final String pagePath = "/html_image.html";
             final String httpUrlImageHtml = generator.getPageTemplateSource(imagePath);
             final String httpImageUrl = webServer.setResponse(pagePath, httpUrlImageHtml, null);
 
             settings.setImagesEnabled(false);
-            loadUrlSync(contentView, contentClient.getOnPageFinishedHelper(), httpImageUrl);
+            loadUrlSync(awContents, contentClient.getOnPageFinishedHelper(), httpImageUrl);
             assertEquals(ImagePageGenerator.IMAGE_NOT_LOADED_STRING,
-                    getTitleOnUiThread(contentView));
+                    getTitleOnUiThread(awContents));
 
             settings.setImagesEnabled(true);
             assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
                     try {
                         return ImagePageGenerator.IMAGE_NOT_LOADED_STRING.equals(
-                            getTitleOnUiThread(contentView));
+                            getTitleOnUiThread(awContents));
                     } catch (Throwable t) {
                         t.printStackTrace();
                         fail("Failed to getTitleOnUIThread: " + t.toString());
                         return false;
                     }
                 }
             }, WAIT_TIMEOUT_SECONDS * 1000, CHECK_INTERVAL));
         } finally {
             if (webServer != null) webServer.shutdown();
         }
     }
 
     // Test an assert URL (file:///android_asset/)
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testAssetUrl() throws Throwable {
         // Note: this text needs to be kept in sync with the contents of the html file referenced
         // below.
         final String expectedTitle = "Asset File";
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
         try {
             useTestResourceContext();
-            loadUrlSync(contentView,
+            loadUrlSync(awContents,
                         contentClient.getOnPageFinishedHelper(),
                         "file:///android_asset/asset_file.html");
-            assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+            assertEquals(expectedTitle, getTitleOnUiThread(awContents));
         } finally {
             resetResourceContext();
         }
     }
 
     // Test a resource URL (file:///android_res/).
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testResourceUrl() throws Throwable {
         // Note: this text needs to be kept in sync with the contents of the html file referenced
         // below.
         final String expectedTitle = "Resource File";
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final ContentViewCore contentView =
-                createAwTestContainerViewOnMainSync(false, contentClient).getContentViewCore();
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
         try {
             useTestResourceContext();
-            loadUrlSync(contentView,
+            loadUrlSync(awContents,
                         contentClient.getOnPageFinishedHelper(),
                         "file:///android_res/raw/resource_file.html");
-            assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+            assertEquals(expectedTitle, getTitleOnUiThread(awContents));
         } finally {
             resetResourceContext();
         }
     }
 
     // Test that the file URL access toggle does not affect asset URLs.
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testFileUrlAccessToggleDoesNotBlockAssetUrls() throws Throwable {
         // Note: this text needs to be kept in sync with the contents of the html file referenced
         // below.
         final String expectedTitle = "Asset File";
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final AwTestContainerView containerView =
-                createAwTestContainerViewOnMainSync(false, contentClient);
-        final ContentViewCore contentView = containerView.getContentViewCore();
-        final AwSettings settings = getAwSettingsOnUiThread(containerView.getAwContents());
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        final AwSettings settings = getAwSettingsOnUiThread(awContents);
         try {
             useTestResourceContext();
             settings.setAllowFileAccess(false);
-            loadUrlSync(contentView,
+            loadUrlSync(awContents,
                         contentClient.getOnPageFinishedHelper(),
                         "file:///android_asset/asset_file.html");
-            assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+            assertEquals(expectedTitle, getTitleOnUiThread(awContents));
         } finally {
             resetResourceContext();
         }
     }
 
     // Test that the file URL access toggle does not affect resource URLs.
     @SmallTest
     @Feature({"Android-WebView", "Navigation"})
     public void testFileUrlAccessToggleDoesNotBlockResourceUrls() throws Throwable {
         // Note: this text needs to be kept in sync with the contents of the html file referenced
         // below.
         final String expectedTitle = "Resource File";
         final TestAwContentsClient contentClient = new TestAwContentsClient();
-        final AwTestContainerView containerView =
-                createAwTestContainerViewOnMainSync(false, contentClient);
-        final ContentViewCore contentView = containerView.getContentViewCore();
-        final AwSettings settings = getAwSettingsOnUiThread(containerView.getAwContents());
+        final AwTestContainerView testContainerView =
+                createAwTestContainerViewOnMainSync(contentClient);
+        final AwContents awContents = testContainerView.getAwContents();
+        final AwSettings settings = getAwSettingsOnUiThread(awContents);
         try {
             useTestResourceContext();
             settings.setAllowFileAccess(false);
-            loadUrlSync(contentView,
+            loadUrlSync(awContents,
                         contentClient.getOnPageFinishedHelper(),
                         "file:///android_res/raw/resource_file.html");
-            assertEquals(expectedTitle, getTitleOnUiThread(contentView));
+            assertEquals(expectedTitle, getTitleOnUiThread(awContents));
         } finally {
             resetResourceContext();
         }
     }
 
     class ViewPair {
-        ViewPair(AwTestContainerView container0, TestAwContentsClient client0,
-                 AwTestContainerView container1, TestAwContentsClient client1) {
-            this.container0 = container0;
+        private final AwContents contents0;
+        private final TestAwContentsClient client0;
+        private final AwContents contents1;
+        private final TestAwContentsClient client1;
+
+        ViewPair(AwContents contents0, TestAwContentsClient client0,
+                 AwContents contents1, TestAwContentsClient client1) {
+            this.contents0 = contents0;
             this.client0 = client0;
-            this.container1 = container1;
+            this.contents1 = contents1;
             this.client1 = client1;
         }
 
-        AwTestContainerView getContainer0() {
-            return container0;
-        }
-
-        ContentViewCore getView0() {
-            return container0.getContentViewCore();
+        AwContents getContents0() {
+            return contents0;
         }
 
         TestAwContentsClient getClient0() {
             return client0;
         }
 
-        AwTestContainerView getContainer1() {
-            return container1;
-        }
-
-        ContentViewCore getView1() {
-            return container1.getContentViewCore();
+        AwContents getContents1() {
+            return contents1;
         }
 
         TestAwContentsClient getClient1() {
             return client1;
         }
-
-        private final AwTestContainerView container0;
-        private final TestAwContentsClient client0;
-        private final AwTestContainerView container1;
-        private final TestAwContentsClient client1;
     }
 
     /**
      * Verifies the following statements about a setting:
      *  - initially, the setting has a default value;
      *  - the setting can be switched to an alternate value and back;
      *  - switching a setting in the first WebView doesn't affect the setting
      *    state in the second WebView and vice versa.
      *
      * @param helper0 Test helper for the first ContentView
@@ skipping 37 matching lines @@
         helper0.ensureSettingHasInitialValue();
         helper1.ensureSettingHasInitialValue();
     }
 
     private ViewPair createViews(
             boolean firstIsIncognito,
             boolean secondIsIncognito) throws Throwable {
         TestAwContentsClient client0 = new TestAwContentsClient();
         TestAwContentsClient client1 = new TestAwContentsClient();
         return new ViewPair(
-            createAwTestContainerViewOnMainSync(firstIsIncognito, client0),
+            createAwTestContainerViewOnMainSync(
+                firstIsIncognito, client0).getAwContents(),
             client0,
-            createAwTestContainerViewOnMainSync(secondIsIncognito, client1),
+            createAwTestContainerViewOnMainSync(
+                secondIsIncognito, client1).getAwContents(),
             client1);
     }
 
     /**
      * Verifies the number of resource requests made to the content provider.
      * @param resource Resource name
      * @param expectedCount Expected resource requests count
      */
     private void ensureResourceRequestCountInContentProvider(String resource, int expectedCount) {
         Context context = getInstrumentation().getTargetContext();
@@ skipping 24 matching lines @@
     private void resetResourceContext() {
         AndroidProtocolHandler.setResourceContextForTesting(null);
     }
 
     @SmallTest
     @Feature({"Android-WebView", "Preferences"})
     public void testBlockNetworkLoadsWithHttpResources() throws Throwable {
         final TestAwContentsClient contentClient = new TestAwContentsClient();
         final AwTestContainerView testContainer =
                 createAwTestContainerViewOnMainSync(false, contentClient);
-        final ContentViewCore contentView = testContainer.getContentViewCore();
-        final ContentSettings contentSettings = getContentSettingsOnUiThread(contentView);
+        final AwContents awContents = testContainer.getAwContents();
+        final ContentSettings contentSettings = getContentSettingsOnUiThread(awContents);
         final AwSettings awSettings = getAwSettingsOnUiThread(testContainer.getAwContents());
         contentSettings.setJavaScriptEnabled(true);
         ImagePageGenerator generator = new ImagePageGenerator(0, false);
 
         TestWebServer webServer = null;
         String fileName = null;
         try {
             // Set up http image.
             webServer = new TestWebServer(false);
             final String httpPath = "/image.png";
             final String imageUrl = webServer.setResponseBase64(
                     httpPath, generator.getImageSourceNoAdvance(),
                     CommonResources.getImagePngHeaders(true));
 
             // Set up file html that loads http iframe.
             String pageHtml ="<img src='" + imageUrl + "' " +
                       "onload=\"document.title='img_onload_fired';\" " +
                       "onerror=\"document.title='img_onerror_fired';\" />";
             Context context = getInstrumentation().getTargetContext();
             fileName = context.getCacheDir() + "/block_network_loads_test.html";
             TestFileUtil.deleteFile(fileName);  // Remove leftover file if any.
             TestFileUtil.createNewHtmlFile(fileName, "unset", pageHtml);
 
             // Actual test. Blocking should trigger onerror handler.
             awSettings.setBlockNetworkLoads(true);
             loadUrlSync(
-                contentView,
+                awContents,
                 contentClient.getOnPageFinishedHelper(),
                 "file:///" + fileName);
             assertEquals(0, webServer.getRequestCount(httpPath));
-            assertEquals("img_onerror_fired", getTitleOnUiThread(contentView));
+            assertEquals("img_onerror_fired", getTitleOnUiThread(awContents));
 
             // Unblock should load normally.
             awSettings.setBlockNetworkLoads(false);
             loadUrlSync(
-                contentView,
+                awContents,
                 contentClient.getOnPageFinishedHelper(),
                 "file:///" + fileName);
             assertEquals(1, webServer.getRequestCount(httpPath));
-            assertEquals("img_onload_fired", getTitleOnUiThread(contentView));
+            assertEquals("img_onload_fired", getTitleOnUiThread(awContents));
         } finally {
             if (fileName != null) TestFileUtil.deleteFile(fileName);
             if (webServer != null) webServer.shutdown();
         }
     }
 }