Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/browser/ui/android/javascript_app_modal_dialog_android.cc

Index: chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
index caa23f07aa4ebad3ae4fa4b0ec65a325d18ca5f2..d038929d46907743a74ff58cda2eeccb36064210 100644
--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.cc
@@ -23,7 +23,7 @@ using base::android::ScopedJavaLocalRef;
 
 JavascriptAppModalDialogAndroid::JavascriptAppModalDialogAndroid(
     JNIEnv* env,
-    JavaScriptAppModalDialog* dialog,
+    app_modal_dialogs::JavaScriptAppModalDialog* dialog,
     gfx::NativeWindow parent)
     : dialog_(dialog),
       parent_jobject_weak_ref_(env, parent->GetJavaObject().obj()) {
@@ -131,7 +131,8 @@ const ScopedJavaGlobalRef<jobject>&
 
 // static
 jobject GetCurrentModalDialog(JNIEnv* env, jclass clazz) {
-  AppModalDialog* dialog = AppModalDialogQueue::GetInstance()->active_dialog();
+  app_modal_dialogs::AppModalDialog* dialog =
+      app_modal_dialogs::AppModalDialogQueue::GetInstance()->active_dialog();
   if (!dialog || !dialog->native_dialog())
     return NULL;
 
@@ -159,14 +160,14 @@ JavascriptAppModalDialogAndroid::~JavascriptAppModalDialogAndroid() {
 namespace {
 
 class ChromeJavaScriptNativeDialogAndroidFactory
-    : public JavaScriptNativeDialogFactory {
+    : public app_modal_dialogs::JavaScriptNativeDialogFactory {
  public:
   ChromeJavaScriptNativeDialogAndroidFactory() {}
   ~ChromeJavaScriptNativeDialogAndroidFactory() override {}
 
  private:
-  NativeAppModalDialog* CreateNativeJavaScriptDialog(
-      JavaScriptAppModalDialog* dialog,
+  app_modal_dialogs::NativeAppModalDialog* CreateNativeJavaScriptDialog(
+      app_modal_dialogs::JavaScriptAppModalDialog* dialog,
       gfx::NativeWindow parent_window) override {
     return new JavascriptAppModalDialogAndroid(
         base::android::AttachCurrentThread(),
@@ -179,7 +180,8 @@ class ChromeJavaScriptNativeDialogAndroidFactory
 }  // namespace
 
 void InstallChromeJavaScriptNativeDialogFactory() {
-  SetJavaScriptNativeDialogFactory(
-      make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory));
+  app_modal_dialogs::JavaScriptDialogManager::GetInstance()->
+      SetNativeDialogFactory(
+          make_scoped_ptr(new ChromeJavaScriptNativeDialogAndroidFactory));
 }