Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.mm

 // 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/ui/cocoa/javascript_app_modal_dialog_cocoa.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 201 matching lines @@
 
   [NSApp endSheet:[[self alert] window]];
 }
 
 @end
 
 ////////////////////////////////////////////////////////////////////////////////
 // JavaScriptAppModalDialogCocoa, public:
 
 JavaScriptAppModalDialogCocoa::JavaScriptAppModalDialogCocoa(
-    JavaScriptAppModalDialog* dialog)
+    app_modal::JavaScriptAppModalDialog* dialog)
     : dialog_(dialog),
       helper_(NULL) {
   // Determine the names of the dialog buttons based on the flags. "Default"
   // is the OK button. "Other" is the cancel button. We don't use the
   // "Alternate" button in NSRunAlertPanel.
   NSString* default_button = l10n_util::GetNSStringWithFixup(IDS_APP_OK);
   NSString* other_button = l10n_util::GetNSStringWithFixup(IDS_APP_CANCEL);
   bool text_field = false;
   bool one_button = false;
   switch (dialog_->javascript_message_type()) {
@@ skipping 200 matching lines @@
   [helper_ playOrQueueAction:ACTION_ACCEPT];
 }
 
 void JavaScriptAppModalDialogCocoa::CancelAppModalDialog() {
   [helper_ playOrQueueAction:ACTION_CANCEL];
 }
 
 namespace {
 
 class ChromeJavaScriptNativeDialogCocoaFactory
-    : public JavaScriptNativeDialogFactory {
+    : public app_modal::JavaScriptNativeDialogFactory {
  public:
   ChromeJavaScriptNativeDialogCocoaFactory() {}
   ~ChromeJavaScriptNativeDialogCocoaFactory() override {}
 
  private:
-  NativeAppModalDialog* CreateNativeJavaScriptDialog(
-      JavaScriptAppModalDialog* dialog,
+  app_modal::NativeAppModalDialog* CreateNativeJavaScriptDialog(
+      app_modal::JavaScriptAppModalDialog* dialog,
       gfx::NativeWindow parent_window) override {
     return new JavaScriptAppModalDialogCocoa(dialog);
   }
 
   DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogCocoaFactory);
 };
 
 }  // namespace
 
 void InstallChromeJavaScriptNativeDialogFactory() {
-  SetJavaScriptNativeDialogFactory(
-      make_scoped_ptr(new ChromeJavaScriptNativeDialogCocoaFactory));
+  app_modal::JavaScriptDialogManager::GetInstance()->
+      SetNativeDialogFactory(
+          make_scoped_ptr(new ChromeJavaScriptNativeDialogCocoaFactory));
 }