Revert "Revert 146000 - Split out ContentViewCore from ContentView for embedders."

This reverts commit 331b803f65e8f994f9148024e8c2be6b465c6a6e.

TBR=ericu@chromium.org

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10696173

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146141 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 10 deletions

diff --git a/base/android/jni_generator/jni_generator.py b/base/android/jni_generator/jni_generator.py
index 9a095bf..9d132fa 100755
--- a/base/android/jni_generator/jni_generator.py
+++ b/base/android/jni_generator/jni_generator.py
@@ -161,14 +161,13 @@ def JavaParamToJni(param):
       'Lorg/chromium/base/SystemMessageHandler',
       'Lorg/chromium/chrome/browser/JSModalDialog',
       'Lorg/chromium/chrome/browser/SelectFileDialog',
-      'Lorg/chromium/content/browser/ChromeVideoView',
-      'Lorg/chromium/content/browser/ContentView',
-      ('Lorg/chromium/content/browser/ContentView$'
-       'FindResultReceivedListener$FindNotificationDetails'),
+      'Lorg/chromium/content/browser/ContentVideoView',
       'Lorg/chromium/content/browser/ContentViewClient',
+      'Lorg/chromium/content/browser/ContentViewCore',
       'Lorg/chromium/content/browser/ContentHttpAuthHandler',
       'Lorg/chromium/content/browser/DeviceOrientation',
       'Lorg/chromium/content/browser/FileChooserParams',
+      'Lorg/chromium/content/browser/FindNotificationDetails',
       'Lorg/chromium/content/browser/InterceptedRequestData',
       'Lorg/chromium/content/browser/JavaInputStream',
       'Lorg/chromium/content/browser/LocationProvider',
diff --git a/base/android/jni_generator/jni_generator_tests.py b/base/android/jni_generator/jni_generator_tests.py
index f0f68f9..1ce7a37 100755
--- a/base/android/jni_generator/jni_generator_tests.py
+++ b/base/android/jni_generator/jni_generator_tests.py
@@ -54,6 +54,7 @@ class TestGenerator(unittest.TestCase):
       print '=' * 80
       self.fail('Golden text mismatch')
 
+  # TODO(bulach): Detangle these tests from knowing about classes from Content.
   def testNatives(self):
     test_data = """"
     private native int nativeInit();
@@ -64,7 +65,7 @@ class TestGenerator(unittest.TestCase):
     private static native String nativeGetDomainAndRegistry(String url);
     private static native void nativeCreateHistoricalTabFromState(
             byte[] state, int tab_index);
-    private native byte[] nativeGetStateAsByteArray(ContentView view);
+    private native byte[] nativeGetStateAsByteArray(ContentViewCore view);
     private static native String[] nativeGetAutofillProfileGUIDs();
     private native void nativeSetRecognitionResults(
             int sessionId, String[] results);
@@ -125,7 +126,7 @@ class TestGenerator(unittest.TestCase):
                      type='function'),
         NativeMethod(return_type='byte[]', static=False,
                      name='GetStateAsByteArray',
-                     params=[Param(datatype='ContentView', name='view')],
+                     params=[Param(datatype='ContentViewCore', name='view')],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='String[]', static=True,
@@ -359,7 +360,7 @@ static bool RegisterNativesImpl(JNIEnv* env) {
 "V", reinterpret_cast<void*>(CreateHistoricalTabFromState) },
     { "nativeGetStateAsByteArray",
 "("
-"Lorg/chromium/content/browser/ContentView;"
+"Lorg/chromium/content/browser/ContentViewCore;"
 ")"
 "[B", reinterpret_cast<void*>(GetStateAsByteArray) },
     { "nativeGetAutofillProfileGUIDs",
@@ -754,7 +755,7 @@ static bool RegisterNativesImpl(JNIEnv* env) {
     void dismiss();
     @SuppressWarnings("unused")
     @CalledByNative
-    private static boolean shouldShowAutoLogin(ContentView contentView,
+    private static boolean shouldShowAutoLogin(ContentViewCore contentView,
             String realm, String account, String args) {
         AccountManagerContainer accountManagerContainer =
             new AccountManagerContainer((Activity)contentView.getContext(),
@@ -826,7 +827,7 @@ static bool RegisterNativesImpl(JNIEnv* env) {
             name='shouldShowAutoLogin',
             method_id_var_name='shouldShowAutoLogin',
             java_class_name='',
-            params=[Param(datatype='ContentView', name='contentView'),
+            params=[Param(datatype='ContentViewCore', name='contentView'),
                     Param(datatype='String', name='realm'),
                     Param(datatype='String', name='account'),
                     Param(datatype='String', name='args')],
@@ -1061,7 +1062,7 @@ static void GetMethodIDsImpl(JNIEnv* env) {
           "shouldShowAutoLogin",
 
 "("
-"Lorg/chromium/content/browser/ContentView;"
+"Lorg/chromium/content/browser/ContentViewCore;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"