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 1f7ab4201338ca6c2ffdd822ff8e2d53885d9826..060c43bd50f55dad11db62c5436a0d986e88bc4b 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::JavaScriptNativeDialogFactory {
  public:
   ChromeJavaScriptNativeDialogViewsFactory() {}
   ~ChromeJavaScriptNativeDialogViewsFactory() override {}
 
  private:
-  NativeAppModalDialog* CreateNativeJavaScriptDialog(
-      JavaScriptAppModalDialog* dialog,
+  app_modal::NativeAppModalDialog* CreateNativeJavaScriptDialog(
+      app_modal::JavaScriptAppModalDialog* dialog,
       gfx::NativeWindow parent_window) override{
-    JavaScriptAppModalDialogViews* d = nullptr;
+    app_modal::JavaScriptAppModalDialogViews* d = nullptr;
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
     d = new JavaScriptAppModalDialogViewsX11(dialog);
 #else
-    d = new JavaScriptAppModalDialogViews(dialog);
+    d = new app_modal::JavaScriptAppModalDialogViews(dialog);
 #endif
     constrained_window::CreateBrowserModalDialogViews(d, parent_window);
     return d;
@@ -42,6 +42,7 @@ class ChromeJavaScriptNativeDialogViewsFactory
 }  // namespace
 
 void InstallChromeJavaScriptNativeDialogFactory() {
-  SetJavaScriptNativeDialogFactory(
-      make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
+  app_modal::JavaScriptDialogManager::GetInstance()->
+      SetNativeDialogFactory(
+          make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
 }