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

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c95e6a3c335658821460baeaafecfb8fd291d52b..77877d3a321aa23b4408d3752d7482293c1f7f45 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -116,6 +116,10 @@
         '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',
@@ -4979,6 +4983,7 @@
         ['OS=="android"', {
           'dependencies': [
             'chrome_browser_jni_headers',
+            'chrome_browser_components.gyp:web_contents_delegate_android',
           ],
           'sources': [
             'browser/ui/webui/ntp/android/bookmarks_handler.cc',
@@ -5603,6 +5608,7 @@
           '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',
           ],