Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

components/app_modal_dialogs/javascript_app_modal_dialog.cc

Index: components/app_modal_dialogs/javascript_app_modal_dialog.cc
diff --git a/components/app_modal_dialogs/javascript_app_modal_dialog.cc b/components/app_modal_dialogs/javascript_app_modal_dialog.cc
index bf7157a58df3a31043b20eada4fac3b1d1e8d9b6..734af35235c89c02f9317630222a8d0f64a7167b 100644
--- a/components/app_modal_dialogs/javascript_app_modal_dialog.cc
+++ b/components/app_modal_dialogs/javascript_app_modal_dialog.cc
@@ -4,7 +4,7 @@
 
 #include "components/app_modal_dialogs/javascript_app_modal_dialog.h"
 
-#include "components/app_modal_dialogs/javascript_dialog_manager_impl.h"
+#include "components/app_modal_dialogs/javascript_dialog_manager.h"
 #include "components/app_modal_dialogs/javascript_native_dialog_factory.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/text_elider.h"
@@ -14,7 +14,6 @@
 #include "ui/aura/window_event_dispatcher.h"
 #endif
 
-using content::JavaScriptDialogManager;
 using content::WebContents;
 
 namespace {
@@ -69,7 +68,7 @@ JavaScriptAppModalDialog::JavaScriptAppModalDialog(
     bool display_suppress_checkbox,
     bool is_before_unload_dialog,
     bool is_reload,
-    const JavaScriptDialogManager::DialogClosedCallback& callback)
+    const content::JavaScriptDialogManager::DialogClosedCallback& callback)
     : AppModalDialog(web_contents, title),
       extra_data_map_(extra_data_map),
       javascript_message_type_(javascript_message_type),
@@ -95,7 +94,7 @@ NativeAppModalDialog* JavaScriptAppModalDialog::CreateNativeDialog() {
     parent_window = NULL;
   }
 #endif  // defined(USE_AURA)
-  return JavaScriptDialogManagerImpl::GetInstance()->native_dialog_factory()->
+  return JavaScriptDialogManager::GetInstance()->native_dialog_factory()->
       CreateNativeJavaScriptDialog(this, parent_window);
 }
 
@@ -161,7 +160,7 @@ void JavaScriptAppModalDialog::NotifyDelegate(bool success,
   }
 
   // The callback_ above may delete web_contents_, thus removing the extra
-  // data from the map owned by ChromeJavaScriptDialogManager. Make sure
+  // data from the map owned by ::JavaScriptDialogManager. Make sure
   // to only use the data if still present. http://crbug.com/236476
   ExtraDataMap::iterator extra_data = extra_data_map_->find(web_contents());
   if (extra_data != extra_data_map_->end()) {