[WebView] Merge AwContentsClientBridgeBase into AwContentsClientBridge

android_webview/browser/aw_contents.cc

 // Copyright 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.
 
 #include "android_webview/browser/aw_contents.h"
 
 #include <limits>
 #include <utility>
 
 #include "android_webview/browser/aw_autofill_client.h"
@@ skipping 243 matching lines @@
   // The |aw_content| param is technically spurious as it duplicates |obj| but
   // is passed over anyway to make the binding more explicit.
   java_ref_ = JavaObjectWeakGlobalRef(env, aw_contents);
 
   web_contents_delegate_.reset(
       new AwWebContentsDelegate(env, web_contents_delegate));
   web_contents_->SetDelegate(web_contents_delegate_.get());
 
   contents_client_bridge_.reset(
       new AwContentsClientBridge(env, contents_client_bridge));
-  AwContentsClientBridgeBase::Associate(web_contents_.get(),
-                                        contents_client_bridge_.get());
+  AwContentsClientBridge::Associate(web_contents_.get(),
+                                    contents_client_bridge_.get());
 
   AwContentsIoThreadClientImpl::Associate(web_contents_.get(),
                                           io_thread_client);
 
   InterceptNavigationDelegate::Associate(
       web_contents_.get(), base::MakeUnique<InterceptNavigationDelegate>(
                                env, intercept_navigation_delegate));
 
   // Finally, having setup the associations, release any deferred requests
   for (content::RenderFrameHost* rfh : web_contents_->GetAllFrames()) {
@@ skipping 1169 matching lines @@
 
   return Java_AwContents_onRenderProcessGoneDetail(env, obj, child_process_id,
                                                    crashed);
 }
 
 void AwContents::RenderProcessReady(content::RenderProcessHost* host) {
   UpdateRendererPriority();
 }
 
 }  // namespace android_webview