[WebView] Merge AwContentsClientBridgeBase into AwContentsClientBridge

android_webview/BUILD.gn

 # Copyright 2015 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.
 
 import("//android_webview/system_webview_apk_tmpl.gni")
 import("//android_webview/webview_repack_locales.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
@@ skipping 428 matching lines @@
     "browser/aw_browser_terminator.cc",
     "browser/aw_browser_terminator.h",
     "browser/aw_content_browser_client.cc",
     "browser/aw_content_browser_client.h",
     "browser/aw_contents.cc",
     "browser/aw_contents.h",
     "browser/aw_contents_background_thread_client.cc",
     "browser/aw_contents_background_thread_client.h",
     "browser/aw_contents_client_bridge.cc",
     "browser/aw_contents_client_bridge.h",
-    "browser/aw_contents_client_bridge_base.cc",
-    "browser/aw_contents_client_bridge_base.h",
     "browser/aw_contents_io_thread_client.h",
     "browser/aw_contents_io_thread_client_impl.cc",
     "browser/aw_contents_io_thread_client_impl.h",
     "browser/aw_contents_lifecycle_notifier.cc",
     "browser/aw_contents_lifecycle_notifier.h",
     "browser/aw_contents_statics.cc",
     "browser/aw_contents_statics.h",
     "browser/aw_cookie_access_policy.cc",
     "browser/aw_cookie_access_policy.h",
     "browser/aw_debug.cc",
@@ skipping 504 matching lines @@
   system_webview_apk_tmpl("system_webview_apk") {
     android_manifest = system_webview_android_manifest
     android_manifest_dep = ":system_webview_manifest"
     deps = [
       ":system_webview_resources",
       "//android_webview/glue",
     ]
     apk_name = "SystemWebView"
   }
 }