Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.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/ui/app_modal/chrome_javascript_native_dialog_factory.h"
 
 #include "components/app_modal/javascript_dialog_manager.h"
 #include "components/app_modal/javascript_native_dialog_factory.h"
 #include "components/constrained_window/constrained_window_views.h"
 
 #if defined(USE_X11) && !defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h"
 #else
 #include "components/app_modal/views/javascript_app_modal_dialog_views.h"
 #endif
 
 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;
   }
 
   DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptNativeDialogViewsFactory);
 };
 
 }  // namespace
 
 void InstallChromeJavaScriptNativeDialogFactory() {
-  SetJavaScriptNativeDialogFactory(
-      make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
+  app_modal::JavaScriptDialogManager::GetInstance()->
+      SetNativeDialogFactory(
+          make_scoped_ptr(new ChromeJavaScriptNativeDialogViewsFactory));
 }