Removing ContentViewCore dependencies from direct WebContents functions.

chrome/android/javatests/src/org/chromium/chrome/browser/input/SelectFileDialogTest.java

 // Copyright 2014 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.chrome.browser.input;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Build;
@@ skipping 66 matching lines @@
                 return mActivityWindowAndroidForTest;
             }
         });
         launchChromeShellWithUrl(DATA_URL);
         assertTrue("Page failed to load", waitForActiveShellToBeDoneLoading());
 
         mContentViewCore = getActivity().getActiveContentViewCore();
         // TODO(aurimas) remove this wait once crbug.com/179511 is fixed.
         assertWaitForPageScaleFactorMatch(2);
         assertTrue(
-                DOMUtils.waitForNonZeroNodeBounds(mContentViewCore, "input_file"));
+                DOMUtils.waitForNonZeroNodeBounds(mContentViewCore.getWebContents(), "input_file"));
     }
 
     /**
      * Tests that clicks on <input type="file" /> trigger intent calls to ActivityWindowAndroid.
      */
     @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
     @MediumTest
     @Feature({"TextInput", "Main"})
     public void testSelectFileAndCancelRequest() throws Throwable {
         DOMUtils.clickNode(this, mContentViewCore, "input_file");
@@ skipping 34 matching lines @@
             @Override
             public void run() {
                 mActivityWindowAndroidForTest.lastCallback.onIntentCompleted(
                         mActivityWindowAndroidForTest, Activity.RESULT_CANCELED, null, null);
             }
         });
         mActivityWindowAndroidForTest.lastCallback = null;
         mActivityWindowAndroidForTest.lastIntent = null;
     }
 }