Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/browser/extensions/chrome_extension_host_delegate.cc

 // Copyright 2014 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/extensions/chrome_extension_host_delegate.h"
 
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
@@ skipping 17 matching lines @@
 void ChromeExtensionHostDelegate::OnRenderViewCreatedForBackgroundPage(
     ExtensionHost* host) {
   ExtensionService* service =
       ExtensionSystem::Get(host->browser_context())->extension_service();
   if (service)
     service->DidCreateRenderViewForBackgroundPage(host);
 }
 
 content::JavaScriptDialogManager*
 ChromeExtensionHostDelegate::GetJavaScriptDialogManager() {
-  return GetJavaScriptDialogManagerInstance();
+  return app_modal::JavaScriptDialogManager::GetInstance();
 }
 
 void ChromeExtensionHostDelegate::CreateTab(content::WebContents* web_contents,
                                             const std::string& extension_id,
                                             WindowOpenDisposition disposition,
                                             const gfx::Rect& initial_pos,
                                             bool user_gesture) {
   ExtensionTabUtil::CreateTab(
       web_contents, extension_id, disposition, initial_pos, user_gesture);
 }
@@ skipping 11 matching lines @@
     content::WebContents* web_contents,
     const GURL& security_origin,
     content::MediaStreamType type,
     const Extension* extension) {
   return MediaCaptureDevicesDispatcher::GetInstance()
       ->CheckMediaAccessPermission(
           web_contents, security_origin, type, extension);
 }
 
 }  // namespace extensions