Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

athena/extensions/athena_javascript_native_dialog_factory.cc

Index: athena/extensions/athena_javascript_native_dialog_factory.cc
diff --git a/athena/extensions/athena_javascript_native_dialog_factory.cc b/athena/extensions/athena_javascript_native_dialog_factory.cc
index b4401a8958765b73671c88b227f82a34495097e5..39c349b7ea0767c607ac1e32d1927d2678c4c1d7 100644
--- a/athena/extensions/athena_javascript_native_dialog_factory.cc
+++ b/athena/extensions/athena_javascript_native_dialog_factory.cc
@@ -17,18 +17,18 @@ namespace athena {
 namespace {
 
 class AthenaJavaScriptNativeDialogFactory
-    : public JavaScriptNativeDialogFactory {
+    : public app_modal::JavaScriptNativeDialogFactory {
  public:
   AthenaJavaScriptNativeDialogFactory() {}
   ~AthenaJavaScriptNativeDialogFactory() override {}
 
  private:
-  // JavScriptNativeDialogFactory:
-  NativeAppModalDialog* CreateNativeJavaScriptDialog(
-      JavaScriptAppModalDialog* dialog,
+  // app_modal::JavScriptNativeDialogFactory:
+  app_modal::NativeAppModalDialog* CreateNativeJavaScriptDialog(
+      app_modal::JavaScriptAppModalDialog* dialog,
       gfx::NativeWindow parent_window) override{
-    JavaScriptAppModalDialogViews* d =
-        new JavaScriptAppModalDialogViews(dialog);
+    app_modal::JavaScriptAppModalDialogViews* d =
+        new app_modal::JavaScriptAppModalDialogViews(dialog);
     constrained_window::CreateBrowserModalDialogViews(d, parent_window);
     return d;
   }
@@ -39,8 +39,9 @@ class AthenaJavaScriptNativeDialogFactory
 }  // namespace
 
 void InstallJavaScriptNativeDialogFactory() {
-  SetJavaScriptNativeDialogFactory(
-      make_scoped_ptr(new AthenaJavaScriptNativeDialogFactory));
+  app_modal::JavaScriptDialogManager::GetInstance()->
+      SetNativeDialogFactory(
+          make_scoped_ptr(new AthenaJavaScriptNativeDialogFactory));
 }
 
 }  // namespace athena