Refactor the Android port to allow access to the chrome layer.

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 98 matching lines @@
         'browser/alternate_nav_url_fetcher.cc',
         'browser/alternate_nav_url_fetcher.h',
         'browser/android/android_protocol_adapter.cc',
         'browser/android/android_protocol_adapter.h',
         'browser/android/android_stream_reader_url_request_job.cc',
         'browser/android/android_stream_reader_url_request_job.h',
         'browser/android/chrome_jni_registrar.cc',
         'browser/android/chrome_jni_registrar.h',
         'browser/android/chrome_startup_flags.cc',
         'browser/android/chrome_startup_flags.h',
+        'browser/android/chrome_web_contents_delegate_android.cc',
+        'browser/android/chrome_web_contents_delegate_android.h',
+        'browser/android/content_view_util.cc',
+        'browser/android/content_view_util.h',
         'browser/android/devtools_server.cc',
         'browser/android/devtools_server.h',
         'browser/android/intent_helper.cc',
         'browser/android/intent_helper.h',
         'browser/android/process_utils.cc',
         'browser/android/process_utils.h',
         'browser/android/tab_android.cc',
         'browser/android/tab_android.h',
         'browser/api/infobars/confirm_infobar_delegate.cc',
         'browser/api/infobars/confirm_infobar_delegate.h',
@@ skipping 4842 matching lines @@
           'sources!': [
             'browser/sessions/session_restore.cc',
             'browser/sessions/session_service.cc',
             'browser/sessions/session_service.h',
             'browser/sessions/session_service_factory.cc',
             'browser/sessions/session_service_factory.h',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
+            'browser/component/components.gyp:web_contents_delegate_android',
             'chrome_browser_jni_headers',
           ],
           'sources': [
             'browser/ui/webui/ntp/android/bookmarks_handler.cc',
             'browser/ui/webui/ntp/android/bookmarks_handler.h',
             'browser/ui/webui/ntp/android/partner_bookmarks_shim.cc',
             'browser/ui/webui/ntp/android/partner_bookmarks_shim.h',
           ],
           'sources!': [
             'browser/bookmarks/bookmark_context_menu_controller.cc',
@@ skipping 605 matching lines @@
             'input_jar_file': '<(android_sdk)/android.jar',
           },
           'includes': [ '../build/jar_file_jni_generator.gypi' ],
         },
         {
           'target_name': 'chrome_browser_jni_headers',
           'type': 'none',
           'sources': [
             'android/java/src/org/chromium/chrome/browser/AndroidProtocolAdapter.java',
             'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',
+            'android/java/src/org/chromium/chrome/browser/ContentViewUtil.java',
             'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
             'android/java/src/org/chromium/chrome/browser/ProcessUtils.java',
           ],
           'variables': {
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
           'dependencies': [
             'android_jar_jni_headers',
           ],
         },
       ],
      },
     ],
   ],
 }