Remove incognito parameter from AwContents

android_webview/java/src/org/chromium/android_webview/AwContents.java

Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 27038d6798e536d1ea791b897a76ef8b924ee27e..4000c235bdb6890876fbbb13ad005d506e2d4424 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -262,6 +262,17 @@ public class AwContents {
         }
     }
 
+    // TODO(kristianm): Merge with other constructor when privateBrowsing
+    // parameter is removed in Android
+    public AwContents(ViewGroup containerView,

[boliu, 2013/01/05 04:54:04]

I assume we are keeping the old version because of keeping downstream compiling?
In that case, the way I would do this is:

* completely implement the new version of the constructor without using the old
one
* remove the old version locally and make sure all of upstream still
compiles/runs (potentially a lot of work)
* add the old version back and have it call the new version (and maybe even mark
it Deprecated if it doesn't break compile)

That way the fixed up would simply be removing the old constructor after
downstream switched to the new one.

[Kristian Monsen, 2013/01/05 05:25:47]

This constructor is never called upstream. Everything compiles and works fine
there. Have not run all the tests, will let the buildbots do that before
commiting :-)

I will swap the constructors around so it is clearer and the next patch will be
smaller.

[boliu, 2013/01/05 05:31:42]

But it will be called after the old one is removed. I'm just saying do that work
now so we know all the implications of this refactor before commiting

[Kristian Monsen, 2013/01/05 08:15:25]

Compiled everything with old constructor commented out. Will run the tests
during the weekend.

+            ContentViewCore.InternalAccessDelegate internalAccessAdapter,
+            AwContentsClient contentsClient,
+            NativeWindow nativeWindow,
+            boolean isAccessFromFileURLsGrantedByDefault) {
+        this(containerView, internalAccessAdapter, contentsClient, nativeWindow, false,
+                isAccessFromFileURLsGrantedByDefault)
+    }
+
     /**
      * @param containerView the view-hierarchy item this object will be bound to.
      * @param internalAccessAdapter to access private methods on containerView.
@@ -281,7 +292,7 @@ public class AwContents {
         // setup performs process initialisation work needed by AwContents.
         mContentViewCore = new ContentViewCore(containerView.getContext(),
                 ContentViewCore.PERSONALITY_VIEW);
-        mNativeAwContents = nativeInit(contentsClient.getWebContentsDelegate(), privateBrowsing);
+        mNativeAwContents = nativeInit(contentsClient.getWebContentsDelegate());
         mContentsClient = contentsClient;
         mCleanupReference = new CleanupReference(this, new DestroyRunnable(mNativeAwContents));
         mClientCallbackHandler = new ClientCallbackHandler();
@@ -934,8 +945,7 @@ public class AwContents {
     //  Native methods
     //--------------------------------------------------------------------------------------------
 
-    private native int nativeInit(AwWebContentsDelegate webViewWebContentsDelegate,
-            boolean privateBrowsing);
+    private native int nativeInit(AwWebContentsDelegate webViewWebContentsDelegate);
     private static native void nativeDestroy(int nativeAwContents);
     private static native void nativeSetAwDrawSWFunctionTable(int functionTablePointer);
     private static native int nativeGetAwDrawGLFunction();