Removing ContentViewCore dependencies from direct WebContents functions.

content/public/android/java/src/org/chromium/content/browser/accessibility/AccessibilityInjector.java

 // Copyright 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.content.browser.accessibility;
 
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Build;
@@ skipping 120 matching lines @@
 
         int axsParameterValue = getAxsUrlParameterValue();
         if (axsParameterValue != ACCESSIBILITY_SCRIPT_INJECTION_UNDEFINED) {
             return;
         }
 
         String js = getScreenReaderInjectingJs();
         if (mContentViewCore.isDeviceAccessibilityScriptInjectionEnabled() &&
                 js != null && mContentViewCore.isAlive()) {
             addOrRemoveAccessibilityApisIfNecessary();
-            mContentViewCore.evaluateJavaScript(js, null);
+            mContentViewCore.getWebContents().evaluateJavaScript(js, null);
             mInjectedScriptEnabled = true;
             mScriptInjected = true;
         }
     }
 
     /**
      * Handles adding or removing accessibility related Java objects ({@link TextToSpeech} and
      * {@link Vibrator}) interfaces from Javascript.  This method should be called at a time when it
      * is safe to add or remove these interfaces, specifically when the {@link ContentViewCore} is
      * first initialized or right before the {@link ContentViewCore} is about to navigate to a URL
@@ skipping 40 matching lines @@
      * @param enabled Whether or not to enable the script.
      */
     public void setScriptEnabled(boolean enabled) {
         if (enabled && !mScriptInjected) injectAccessibilityScriptIntoPage();
         if (!accessibilityIsAvailable() || mInjectedScriptEnabled == enabled) return;
 
         mInjectedScriptEnabled = enabled;
         if (mContentViewCore.isAlive()) {
             String js = String.format(TOGGLE_CHROME_VOX_JAVASCRIPT, Boolean.toString(
                     mInjectedScriptEnabled));
-            mContentViewCore.evaluateJavaScript(js, null);
+            mContentViewCore.getWebContents().evaluateJavaScript(js, null);
 
             if (!mInjectedScriptEnabled) {
                 // Stop any TTS/Vibration right now.
                 onPageLostFocus();
             }
         }
     }
 
     /**
      * Notifies this handler that a page load has started, which means we should mark the
@@ skipping 249 matching lines @@
             }
         }
 
         @SuppressWarnings("unused")
         protected void shutdownInternal() {
             mTextToSpeech.shutdown();
             mSelfBrailleClient.shutdown();
         }
     }
 }