Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/browser/android/chrome_web_contents_delegate_android.cc

 // 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.
 
 #include "chrome/browser/android/chrome_web_contents_delegate_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 198 matching lines @@
 
   Java_ChromeWebContentsDelegateAndroid_onFindMatchRectsAvailable(
       env,
       obj.obj(),
       details_object.obj());
 }
 
 content::JavaScriptDialogManager*
 ChromeWebContentsDelegateAndroid::GetJavaScriptDialogManager(
     WebContents* source) {
-  return GetJavaScriptDialogManagerInstance();
+  return app_modal::JavaScriptDialogManager::GetInstance();
 }
 
 void ChromeWebContentsDelegateAndroid::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
   MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
       web_contents, request, callback, NULL);
 }
 
@@ skipping 103 matching lines @@
   }
 
   if (was_blocked)
     *was_blocked = !handled;
   if (!handled)
     delete new_contents;
 }
 
 }  // namespace android
 }  // namespace chrome