[Android] Fix WebView tests breakage after http://crrev.com/10916160

android_webview/java/src/org/chromium/android_webview/AwContents.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;
 
 import android.view.ViewGroup;
 import android.os.Message;
 
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content.common.CleanupReference;
+import org.chromium.ui.gfx.NativeWindow;
 
 /**
  * Exposes the native AwContents class, and together these classes wrap the ContentViewCore
  * and Browser components that are required to implement Android WebView API. This is the
  * primary entry point for the WebViewProvider implementation; it holds a 1:1 object
  * relationship with application WebView instances.
  * (We define this class independent of the hidden WebViewProvider interfaces, to allow
  * continuous build & test in the open source SDK-based tree).
  */
 @JNINamespace("android_webview")
@@ skipping 25 matching lines @@
      * @param internalAccessAdapter to access private methods on containerView.
      * @param contentViewCore requires an existing but not yet initialized instance. Will be
      *                         initialized on return.
      * @param contentsClient will receive API callbacks from this WebView Contents
      * @param privateBrowsing whether this is a private browsing instance of WebView.
      * @param isAccessFromFileURLsGrantedByDefault passed to ContentViewCore.initialize.
      */
     public AwContents(ViewGroup containerView,
         ContentViewCore.InternalAccessDelegate internalAccessAdapter,
         ContentViewCore contentViewCore, AwContentsClient contentsClient,
-        boolean privateBrowsing, boolean isAccessFromFileURLsGrantedByDefault) {
+        NativeWindow nativeWindow, boolean privateBrowsing,
+        boolean isAccessFromFileURLsGrantedByDefault) {
       mNativeAwContents = nativeInit(contentsClient.getWebContentsDelegate(), privateBrowsing);
       mContentViewCore = contentViewCore;
       mContentsClient = contentsClient;
       mCleanupReference = new CleanupReference(this, new DestroyRunnable(mNativeAwContents));
 
       // TODO: upstream the needed ContentViewCore initialization method.
       // mContentViewCore.initialize(containerView, internalAccessAdapter, false,
-      //     nativeGetWebContents(mNativeAwContents), isAccessFromFileURLsGrantedByDefault);
+      //     nativeGetWebContents(mNativeAwContents), nativeWindow,
+      //     isAccessFromFileURLsGrantedByDefault);
       mContentViewCore.setContentViewClient(contentsClient);
     }
 
     public ContentViewCore getContentViewCore() {
         return mContentViewCore;
     }
 
     public void destroy() {
         if (mContentViewCore != null) {
             mContentViewCore.destroy();
@@ skipping 38 matching lines @@
     //--------------------------------------------------------------------------------------------
 
     private native int nativeInit(AwWebContentsDelegate webViewWebContentsDelegate,
             boolean privateBrowsing);
     private static native void nativeDestroy(int nativeAwContents);
 
     private native int nativeGetWebContents(int nativeAwContents);
 
     private native void nativeDocumentHasImages(int nativeAwContents, Message message);
 }