Removing ContentViewCore dependencies from direct WebContents functions.

chrome/android/sync_shell/javatests/src/chromium/chrome/browser/sync/SyncTest.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.sync;
 
 import android.accounts.Account;
 import android.app.Activity;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Log;
@@ skipping 130 matching lines @@
         final String expectedSyncSummary =
                 aboutInfoGetter.getAboutInfo().get(SyncTestUtil.SYNC_SUMMARY_STATUS);
 
         Criteria checker = new Criteria() {
             @Override
             public boolean isSatisfied() {
                 final ContentViewCore contentViewCore = getContentViewCore(getActivity());
                 String innerHtml = "";
                 try {
                     innerHtml = JavaScriptUtils.executeJavaScriptAndWaitForResult(
-                            contentViewCore, "document.documentElement.innerHTML");
+                            contentViewCore.getWebContents(), "document.documentElement.innerHTML");
                 } catch (InterruptedException e) {
                     Log.w(TAG, "Interrupted while polling about:sync page for sync status.", e);
                 } catch (TimeoutException e) {
                     Log.w(TAG, "Interrupted while polling about:sync page for sync status.", e);
                 }
                 return innerHtml.contains(expectedSyncSummary);
             }
 
         };
         boolean hadExpectedStatus = CriteriaHelper.pollForCriteria(
@@ skipping 46 matching lines @@
 
         SyncTestUtil.verifySyncIsSignedIn(mContext, defaultTestAccount);
         assertTrue("Sync everything should be enabled",
                 SyncTestUtil.isSyncEverythingEnabled(mContext));
     }
 
     private static ContentViewCore getContentViewCore(ChromeShellActivity activity) {
         return activity.getActiveContentViewCore();
     }
 }