[WebView] Merge AwContentsClientBridgeBase into AwContentsClientBridge

android_webview/browser/aw_javascript_dialog_manager.cc

Index: android_webview/browser/aw_javascript_dialog_manager.cc
diff --git a/android_webview/browser/aw_javascript_dialog_manager.cc b/android_webview/browser/aw_javascript_dialog_manager.cc
index 6b5338647befa47e8ca9a4d2e1f8f27774d8ef54..a4f2d76fef7d6255c2d4086497f11cb9cee277dd 100644
--- a/android_webview/browser/aw_javascript_dialog_manager.cc
+++ b/android_webview/browser/aw_javascript_dialog_manager.cc
@@ -4,7 +4,7 @@
 
 #include "android_webview/browser/aw_javascript_dialog_manager.h"
 
-#include "android_webview/browser/aw_contents_client_bridge_base.h"
+#include "android_webview/browser/aw_contents_client_bridge.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 
@@ -22,8 +22,8 @@ void AwJavaScriptDialogManager::RunJavaScriptDialog(
     const base::string16& default_prompt_text,
     const DialogClosedCallback& callback,
     bool* did_suppress_message) {
-  AwContentsClientBridgeBase* bridge =
-      AwContentsClientBridgeBase::FromWebContents(web_contents);
+  AwContentsClientBridge* bridge =
+      AwContentsClientBridge::FromWebContents(web_contents);
   if (!bridge) {
     callback.Run(false, base::string16());
     return;
@@ -37,8 +37,8 @@ void AwJavaScriptDialogManager::RunBeforeUnloadDialog(
     content::WebContents* web_contents,
     bool is_reload,
     const DialogClosedCallback& callback) {
-  AwContentsClientBridgeBase* bridge =
-      AwContentsClientBridgeBase::FromWebContents(web_contents);
+  AwContentsClientBridge* bridge =
+      AwContentsClientBridge::FromWebContents(web_contents);
   if (!bridge) {
     callback.Run(false, base::string16());
     return;