Remove incognito parameter from AwContents

android_webview/javatests/src/org/chromium/android_webview/test/AndroidWebViewTestBase.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.app.Instrumentation;
 import android.content.Context;
 import android.test.ActivityInstrumentationTestCase2;
 
@@ skipping 185 matching lines @@
             throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 awContents.loadUrl(LoadUrlParams.createLoadDataParams(
                         data, mimeType, isBase64Encoded));
             }
         });
     }
 
-    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;
     }
 
     protected AwTestContainerView createAwTestContainerViewOnMainSync(
             final AwContentsClient client) throws Exception {
         return createAwTestContainerViewOnMainSync(NORMAL_VIEW, client);
     }
 
     protected AwTestContainerView createAwTestContainerViewOnMainSync(
             final boolean incognito,

[boliu, 2013/01/05 09:11:14]

Will be more work to remove this

[Kristian Monsen, 2013/01/07 17:35:01]

It was a bit of work, also removed what was a bunch of duplicate test functions.

             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();
     }
 
     protected void destroyAwContentsOnMainSync(final AwContents awContents) {
         if (awContents == null) return;
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
@@ skipping 67 matching lines @@
             final AwContents awContents,
             final boolean includeDiskFiles) throws Throwable {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
               awContents.clearCache(includeDiskFiles);
             }
         });
     }
 }