Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc

Index: chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
diff --git a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
index 8a40a2ff9ec09ef12477c3e38f666071b47771dc..84058ee4ebb7134c375b2a5551127f0875084a2f 100644
--- a/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
+++ b/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc
@@ -17,20 +17,20 @@
 namespace {
 
 class ChromeJavaScriptNativeDialogViewsFactory
-    : public JavaScriptNativeDialogFactory {
+    : public app_modal_dialogs::JavaScriptNativeDialogFactory {
  public:
   ChromeJavaScriptNativeDialogViewsFactory() {}
   ~ChromeJavaScriptNativeDialogViewsFactory() override {}
 
  private:
-  NativeAppModalDialog* CreateNativeJavaScriptDialog(
-      JavaScriptAppModalDialog* dialog,
+  app_modal_dialogs::NativeAppModalDialog* CreateNativeJavaScriptDialog(
+      app_modal_dialogs::JavaScriptAppModalDialog* dialog,
       gfx::NativeWindow parent_window) override{
-    JavaScriptAppModalDialogViews* d = nullptr;
+    app_modal_dialogs::JavaScriptAppModalDialogViews* d = nullptr;
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
     d = new JavaScriptAppModalDialogViewsX11(dialog);
 #else
-    d = new JavaScriptAppModalDialogViews(dialog);
+    d = new app_modal_dialogs::JavaScriptAppModalDialogViews(dialog);
 #endif
     CreateBrowserModalDialogViews(d, parent_window);
     return d;
@@ -42,6 +42,7 @@ class ChromeJavaScriptNativeDialogViewsFactory
 }  // namespace
 
 void InstallChromeJavaScriptNativeDialogFactory() {
-  SetJavaScriptNativeDialogFactory(
-      make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
+  app_modal_dialogs::JavaScriptDialogManager::GetInstance()->
+      SetNativeDialogFactory(
+          make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
 }