Refactor ContentShell to remove ContentViewClient dependency.

content/content_shell.gypi

 # 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.
 
 {
   'variables': {
     'content_shell_product_name': 'Content Shell',
   },
   'targets': [
     {
@@ skipping 120 matching lines @@
               },
             },
           },
         }],  # OS=="win"
         ['OS!="android"', {
           'dependencies': [
             # This dependency is for running DRT against the content shell, and
             # this combination is not yet supported on Android.
             '../webkit/support/webkit_support.gyp:webkit_support',
           ],
-        }],  # OS!="android"
+        }, {  # else: OS=="android"
+          'dependencies': [
+            'content_shell_jni_headers',
+          ],
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)/content/shell',
+          ],
+        }],  # OS=="android"
         ['use_aura==1', {
           'sources/': [
             ['exclude', 'shell/shell_gtk.cc'],
             ['exclude', 'shell/shell_win.cc'],
           ],
         }],  # use_aura==1
         ['inside_chromium_build==0 or component!="shared_library"', {
           'dependencies': [
             '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_test_support',
             '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
@@ skipping 340 matching lines @@
     ['OS=="android"', {
       'targets': [
         {
           # TODO(jrg): Update this action and other jni generators to only
           # require specifying the java directory and generate the rest.
           'target_name': 'content_shell_jni_headers',
           'type': 'none',
           'variables': {
             'java_sources': [
               'shell/android/java/src/org/chromium/content_shell/ShellManager.java',
-              'shell/android/java/src/org/chromium/content_shell/ShellView.java',
+              'shell/android/java/src/org/chromium/content_shell/Shell.java',
             ],
             'jni_headers': [
               '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_manager_jni.h',
-              '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_view_jni.h',
+              '<(SHARED_INTERMEDIATE_DIR)/content/shell/jni/shell_jni.h',
             ],
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
         {
           'target_name': 'libcontent_shell_content_view',
           'type': 'shared_library',
           'dependencies': [
             'content_shell_jni_headers',
             'content_shell_lib',
             'content_shell_pak',
             # Skia is necessary to ensure the dependencies needed by
             # WebContents are included.
             '../skia/skia.gyp:skia',
             '<(DEPTH)/media/media.gyp:player_android',
           ],
           'include_dirs': [
             '<(SHARED_INTERMEDIATE_DIR)/content/shell',
           ],
           'sources': [
             'shell/android/shell_library_loader.cc',
             'shell/android/shell_library_loader.h',
             'shell/android/shell_manager.cc',
             'shell/android/shell_manager.h',
-            'shell/android/shell_view.cc',
-            'shell/android/shell_view.h',
           ],
           'sources!': [
             'shell/shell_main.cc',
             'shell/shell_main.h',
           ],
           'conditions': [
             ['android_build_type==1', {
               'ldflags': [
                 '-lgabi++',  # For rtti
               ],
@@ skipping 99 matching lines @@
                 '-buildfile',
                 '<(DEPTH)/content/shell/android/javatests/content_shell_test_apk.xml',
               ]
             }
           ],
         },
       ],
     }],  # OS=="android"
   ]
 }