Revert 146000 - Split out ContentViewCore from ContentView for embedders.

content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java

Index: content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java
===================================================================
--- content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java	(revision 146004)
+++ content/public/android/java/src/org/chromium/content/browser/ContentViewClient.java	(working copy)
@@ -5,18 +5,18 @@
 package org.chromium.content.browser;
 
 import android.content.ActivityNotFoundException;
-import android.content.Context;
 import android.content.Intent;
 import android.graphics.Rect;
 import android.graphics.RectF;
 import android.util.Log;
 import android.view.KeyEvent;
 
+import java.net.URISyntaxException;
+
 import org.chromium.base.AccessedByNative;
 import org.chromium.base.CalledByNative;
+import org.chromium.content.browser.ContentHttpAuthHandler;
 
-import java.net.URISyntaxException;
-
 /**
  *  Main callback class used by ContentView.
  *
@@ -277,7 +277,7 @@
     /**
      * Called when a new content intent is requested to be started.
      */
-    public void onStartContentIntent(Context context, String contentUrl) {
+    public void onStartContentIntent(ContentView chromeView, String contentUrl) {
         Intent intent;
         // Perform generic parsing of the URI to turn it into an Intent.
         try {
@@ -288,7 +288,7 @@
         }
 
         try {
-            context.startActivity(intent);
+            chromeView.getContext().startActivity(intent);
         } catch (ActivityNotFoundException ex) {
             Log.w(TAG, "No application can handle " + contentUrl);
         }