Revert 146000 - Split out ContentViewCore from ContentView for embedders.

base/android/jni_generator/jni_generator_tests.py

 #!/usr/bin/env python
 # Copyright (c) 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.
 
 """Tests for jni_generator.py.
 
 This test suite contains various tests for the JNI generator.
 It exercises the low-level parser all the way up to the
 code generator and ensures the output matches a golden
@@ skipping 36 matching lines @@
     if stripped_golden != stripped_generated:
       print self.id()
       for line in difflib.context_diff(stripped_golden, stripped_generated):
         print line
       print '\n\nGenerated'
       print '=' * 80
       print generated_text
       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();
     private native void nativeDestroy(int nativeChromeBrowserProvider);
     private native long nativeAddBookmark(
             int nativeChromeBrowserProvider,
             String url, String title, boolean isFolder, long parentId);
     private static native String nativeGetDomainAndRegistry(String url);
     private static native void nativeCreateHistoricalTabFromState(
             byte[] state, int tab_index);
-    private native byte[] nativeGetStateAsByteArray(ContentViewCore view);
+    private native byte[] nativeGetStateAsByteArray(ContentView view);
     private static native String[] nativeGetAutofillProfileGUIDs();
     private native void nativeSetRecognitionResults(
             int sessionId, String[] results);
     private native long nativeAddBookmarkFromAPI(
             int nativeChromeBrowserProvider,
             String url, Long created, Boolean isBookmark,
             Long date, byte[] favicon, String title, Integer visits);
     native int nativeFindAll(String find);
     private static native BookmarkNode nativeGetDefaultBookmarkFolder();
     private native SQLiteCursor nativeQueryBookmarkFromAPI(
@@ skipping 40 matching lines @@
         NativeMethod(return_type='void', static=True,
                      name='CreateHistoricalTabFromState',
                      params=[Param(datatype='byte[]',
                                    name='state'),
                              Param(datatype='int',
                                    name='tab_index')],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='byte[]', static=False,
                      name='GetStateAsByteArray',
-                     params=[Param(datatype='ContentViewCore', name='view')],
+                     params=[Param(datatype='ContentView', name='view')],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='String[]', static=True,
                      name='GetAutofillProfileGUIDs', params=[],
                      java_class_name=None,
                      type='function'),
         NativeMethod(return_type='void', static=False,
                      name='SetRecognitionResults',
                      params=[Param(datatype='int', name='sessionId'),
                              Param(datatype='String[]', name='results')],
@@ skipping 213 matching lines @@
 ")"
 "Ljava/lang/String;", reinterpret_cast<void*>(GetDomainAndRegistry) },
     { "nativeCreateHistoricalTabFromState",
 "("
 "[B"
 "I"
 ")"
 "V", reinterpret_cast<void*>(CreateHistoricalTabFromState) },
     { "nativeGetStateAsByteArray",
 "("
-"Lorg/chromium/content/browser/ContentViewCore;"
+"Lorg/chromium/content/browser/ContentView;"
 ")"
 "[B", reinterpret_cast<void*>(GetStateAsByteArray) },
     { "nativeGetAutofillProfileGUIDs",
 "("
 ")"
 "[Ljava/lang/String;", reinterpret_cast<void*>(GetAutofillProfileGUIDs) },
     { "nativeSetRecognitionResults",
 "("
 "I"
 "[Ljava/lang/String;"
@@ skipping 374 matching lines @@
         AutoLoginInfoBar infobar = new AutoLoginInfoBar(nativeInfoBar, mContext,
                 realm, account, args);
         if (infobar.displayedAccountCount() == 0)
             infobar = null;
         return infobar;
     }
     @CalledByNative("InfoBar")
     void dismiss();
     @SuppressWarnings("unused")
     @CalledByNative
-    private static boolean shouldShowAutoLogin(ContentViewCore contentView,
+    private static boolean shouldShowAutoLogin(ContentView contentView,
             String realm, String account, String args) {
         AccountManagerContainer accountManagerContainer =
             new AccountManagerContainer((Activity)contentView.getContext(),
             realm, account, args);
         String[] logins = accountManagerContainer.getAccountLogins(null);
         return logins.length != 0;
     }
     @CalledByNative
     static InputStream openUrl(String url) {
         return null;
@@ skipping 51 matching lines @@
             env_call=('Void', ''),
             unchecked=False,
         ),
         CalledByNative(
             return_type='boolean',
             system_class=False,
             static=True,
             name='shouldShowAutoLogin',
             method_id_var_name='shouldShowAutoLogin',
             java_class_name='',
-            params=[Param(datatype='ContentViewCore', name='contentView'),
+            params=[Param(datatype='ContentView', name='contentView'),
                     Param(datatype='String', name='realm'),
                     Param(datatype='String', name='account'),
                     Param(datatype='String', name='args')],
             env_call=('Boolean', ''),
             unchecked=False,
         ),
         CalledByNative(
             return_type='InputStream',
             system_class=False,
             static=True,
@@ skipping 214 matching lines @@
 "("
 ")"
 "V");
 
   g_TestJni_shouldShowAutoLogin =
       base::android::GetStaticMethodID(
           env, g_TestJni_clazz,
           "shouldShowAutoLogin",
 
 "("
-"Lorg/chromium/content/browser/ContentViewCore;"
+"Lorg/chromium/content/browser/ContentView;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 "Ljava/lang/String;"
 ")"
 "Z");
 
   g_TestJni_openUrl =
       base::android::GetStaticMethodID(
           env, g_TestJni_clazz,
           "openUrl",
@@ skipping 423 matching lines @@
     self.assertRaises(SystemExit, jni_generator.CheckFilenames,
                       ['NotTheSame.java'], ['not_good.h'])
     self.assertRaises(SystemExit, jni_generator.CheckFilenames,
                       ['MissingJniSuffix.java'], ['missing_jni_suffix.h'])
     jni_generator.CheckFilenames(['ThisIsFine.java'], ['this_is_fine_jni.h'])
     jni_generator.CheckFilenames([], [])
 
 
 if __name__ == '__main__':
   unittest.main()