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

base/android/jni_generator/jni_generator.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.
 
 # TODO (qinmin): Need to refactor this file as base should not know about
 # higher level concepts. Currently this file has knowledge about higher level
 # java classes.
 
 """Extracts native methods from a Java file and generates the JNI bindings.
@@ skipping 143 matching lines @@
       'Lcom/google/android/apps/chrome/PageInfoViewer',
       'Lcom/google/android/apps/chrome/Tab',
       'Lcom/google/android/apps/chrome/database/SQLiteCursor',
       'Lcom/google/android/apps/chrome/infobar/InfoBarContainer',
       'Lcom/google/android/apps/chrome/infobar/InfoBarContainer$NativeInfoBar',
       ('Lcom/google/android/apps/chrome/preferences/ChromeNativePreferences$'
        'PasswordListObserver'),
       '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',
       'Lorg/chromium/content/browser/SandboxedProcessArgs',
       'Lorg/chromium/content/browser/SandboxedProcessConnection',
       'Lorg/chromium/content/app/SandboxedProcessService',
       'Lorg/chromium/content/browser/TouchPoint',
       'Lorg/chromium/content/browser/WaitableNativeEvent',
       'Lorg/chromium/content/common/DeviceInfo',
       'Lorg/chromium/content/common/SurfaceTextureListener',
@@ skipping 812 matching lines @@
   CheckFilenames(input_files, output_files)
   if options.jar_file:
     # CheckFileNames guarantees same length for inputs and outputs
     out_dirs = map(os.path.dirname, output_files)
     input_files = ExtractInputFiles(options.jar_file, input_files, out_dirs)
   GenerateJNIHeaders(input_files, output_files, options.namespace)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))