Rename JavaScriptDialogCreator to JavaScriptDialogManager.

It has taken on some responsibility besides just creating dialogs. I'm also planning on adding an additional method soon for accepting/dismissing an open dialog.
BUG=none
TBR=joth

Review URL: https://codereview.chromium.org/12082123

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180194 0039d316-1c4b-4281-b951-d872f2087c98

45 files changed, 232 insertions, 232 deletions

diff --git a/android_webview/native/aw_browser_dependency_factory.h b/android_webview/native/aw_browser_dependency_factory.h
index f823484..0824302 100644
--- a/android_webview/native/aw_browser_dependency_factory.h
+++ b/android_webview/native/aw_browser_dependency_factory.h
@@ -9,7 +9,7 @@
 
 namespace content {
 class BrowserContext;
-class JavaScriptDialogCreator;
+class JavaScriptDialogManager;
 class WebContents;
 }
 
diff --git a/android_webview/native/aw_contents.h b/android_webview/native/aw_contents.h
index 8b53026..6747ac7 100644
--- a/android_webview/native/aw_contents.h
+++ b/android_webview/native/aw_contents.h
@@ -16,7 +16,7 @@
 #include "base/android/jni_helper.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/android/compositor.h"
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 #include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkPicture.h"
 
diff --git a/android_webview/native/aw_javascript_dialog_creator.cc b/android_webview/native/aw_javascript_dialog_manager.cc
index bf3e1b3..608badb 100644
--- a/android_webview/native/aw_javascript_dialog_creator.cc
+++ b/android_webview/native/aw_javascript_dialog_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/native/aw_javascript_dialog_creator.h"
+#include "android_webview/native/aw_javascript_dialog_manager.h"
 
 #include "android_webview/native/aw_contents.h"
 #include "android_webview/native/js_result_handler.h"
@@ -12,7 +12,7 @@
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "base/string16.h"
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 
 using base::android::AttachCurrentThread;
@@ -20,11 +20,11 @@ using base::android::ScopedJavaLocalRef;
 
 namespace android_webview {
 
-AwJavaScriptDialogCreator::AwJavaScriptDialogCreator() {}
+AwJavaScriptDialogManager::AwJavaScriptDialogManager() {}
 
-AwJavaScriptDialogCreator::~AwJavaScriptDialogCreator() {}
+AwJavaScriptDialogManager::~AwJavaScriptDialogManager() {}
 
-void AwJavaScriptDialogCreator::RunJavaScriptDialog(
+void AwJavaScriptDialogManager::RunJavaScriptDialog(
     content::WebContents* web_contents,
     const GURL& origin_url,
     const std::string& accept_lang,
@@ -42,7 +42,7 @@ void AwJavaScriptDialogCreator::RunJavaScriptDialog(
                                 default_prompt_text, js_result);
 }
 
-void AwJavaScriptDialogCreator::RunBeforeUnloadDialog(
+void AwJavaScriptDialogManager::RunBeforeUnloadDialog(
     content::WebContents* web_contents,
     const string16& message_text,
     bool is_reload,
@@ -56,7 +56,7 @@ void AwJavaScriptDialogCreator::RunBeforeUnloadDialog(
                                   js_result);
 }
 
-void AwJavaScriptDialogCreator::ResetJavaScriptState(
+void AwJavaScriptDialogManager::ResetJavaScriptState(
     content::WebContents* web_contents) {
 }
 
diff --git a/android_webview/native/aw_javascript_dialog_creator.h b/android_webview/native/aw_javascript_dialog_manager.h
index 9c5f9a5..63aed51 100644
--- a/android_webview/native/aw_javascript_dialog_creator.h
+++ b/android_webview/native/aw_javascript_dialog_manager.h
@@ -2,19 +2,19 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ANDROID_WEBVIEW_NATIVE_AW_JAVASCRIPT_DIALOG_CREATOR_H_
-#define ANDROID_WEBVIEW_NATIVE_AW_JAVASCRIPT_DIALOG_CREATOR_H_
+#ifndef ANDROID_WEBVIEW_NATIVE_AW_JAVASCRIPT_DIALOG_MANAGER_H_
+#define ANDROID_WEBVIEW_NATIVE_AW_JAVASCRIPT_DIALOG_MANAGER_H_
 
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 
 namespace android_webview {
 
-class AwJavaScriptDialogCreator : public content::JavaScriptDialogCreator {
+class AwJavaScriptDialogManager : public content::JavaScriptDialogManager {
  public:
-  explicit AwJavaScriptDialogCreator();
-  virtual ~AwJavaScriptDialogCreator();
+  explicit AwJavaScriptDialogManager();
+  virtual ~AwJavaScriptDialogManager();
 
-  // Overridden from content::JavaScriptDialogCreator:
+  // Overridden from content::JavaScriptDialogManager:
   virtual void RunJavaScriptDialog(
       content::WebContents* web_contents,
       const GURL& origin_url,
@@ -33,9 +33,9 @@ class AwJavaScriptDialogCreator : public content::JavaScriptDialogCreator {
       content::WebContents* web_contents) OVERRIDE;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(AwJavaScriptDialogCreator);
+  DISALLOW_COPY_AND_ASSIGN(AwJavaScriptDialogManager);
 };
 
 }  // namespace android_webview
 
-#endif  // ANDROID_WEBVIEW_NATIVE_AW_JAVASCRIPT_DIALOG_CREATOR_H_
+#endif  // ANDROID_WEBVIEW_NATIVE_AW_JAVASCRIPT_DIALOG_MANAGER_H_
diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc
index 27847c4..e08a65f 100644
--- a/android_webview/native/aw_web_contents_delegate.cc
+++ b/android_webview/native/aw_web_contents_delegate.cc
@@ -6,7 +6,7 @@
 
 #include "android_webview/browser/find_helper.h"
 #include "android_webview/native/aw_contents.h"
-#include "android_webview/native/aw_javascript_dialog_creator.h"
+#include "android_webview/native/aw_javascript_dialog_manager.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/lazy_instance.h"
 #include "base/message_loop.h"
@@ -19,8 +19,8 @@ using content::WebContents;
 
 namespace android_webview {
 
-static base::LazyInstance<AwJavaScriptDialogCreator>::Leaky
-    g_javascript_dialog_creator = LAZY_INSTANCE_INITIALIZER;
+static base::LazyInstance<AwJavaScriptDialogManager>::Leaky
+    g_javascript_dialog_manager = LAZY_INSTANCE_INITIALIZER;
 
 AwWebContentsDelegate::AwWebContentsDelegate(
     JNIEnv* env,
@@ -31,9 +31,9 @@ AwWebContentsDelegate::AwWebContentsDelegate(
 AwWebContentsDelegate::~AwWebContentsDelegate() {
 }
 
-content::JavaScriptDialogCreator*
-AwWebContentsDelegate::GetJavaScriptDialogCreator() {
-  return g_javascript_dialog_creator.Pointer();
+content::JavaScriptDialogManager*
+AwWebContentsDelegate::GetJavaScriptDialogManager() {
+  return g_javascript_dialog_manager.Pointer();
 }
 
 void AwWebContentsDelegate::FindReply(WebContents* web_contents,
diff --git a/android_webview/native/aw_web_contents_delegate.h b/android_webview/native/aw_web_contents_delegate.h
index 737c6b1..97b4fef 100644
--- a/android_webview/native/aw_web_contents_delegate.h
+++ b/android_webview/native/aw_web_contents_delegate.h
@@ -19,7 +19,7 @@ class AwWebContentsDelegate
  public:
   AwWebContentsDelegate(JNIEnv* env, jobject obj);
   virtual ~AwWebContentsDelegate();
-  virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator()
+  virtual content::JavaScriptDialogManager* GetJavaScriptDialogManager()
       OVERRIDE;
   virtual void FindReply(content::WebContents* web_contents,
                          int request_id,
diff --git a/android_webview/native/js_result_handler.cc b/android_webview/native/js_result_handler.cc
index 56d57dc..974c741 100644
--- a/android_webview/native/js_result_handler.cc
+++ b/android_webview/native/js_result_handler.cc
@@ -5,9 +5,9 @@
 #include "android_webview/native/js_result_handler.h"
 
 #include "base/android/jni_string.h"
-#include "jni/JsResultHandler_jni.h"
-#include "content/public/browser/javascript_dialogs.h"
 #include "content/public/browser/android/content_view_core.h"
+#include "content/public/browser/javascript_dialog_manager.h"
+#include "jni/JsResultHandler_jni.h"
 
 using base::android::ConvertJavaStringToUTF16;
 using content::ContentViewCore;
@@ -18,8 +18,8 @@ void ConfirmJsResult(JNIEnv* env,
                      jobject obj,
                      jint dialogPointer,
                      jstring promptResult) {
-  content::JavaScriptDialogCreator::DialogClosedCallback* dialog_ =
-      reinterpret_cast<content::JavaScriptDialogCreator::DialogClosedCallback*>(
+  content::JavaScriptDialogManager::DialogClosedCallback* dialog_ =
+      reinterpret_cast<content::JavaScriptDialogManager::DialogClosedCallback*>(
           dialogPointer);
   string16 prompt_text;
   if (promptResult) {
@@ -29,15 +29,15 @@ void ConfirmJsResult(JNIEnv* env,
 }
 
 void CancelJsResult(JNIEnv* env, jobject obj, jint dialogPointer) {
-  content::JavaScriptDialogCreator::DialogClosedCallback* dialog_ =
-      reinterpret_cast<content::JavaScriptDialogCreator::DialogClosedCallback*>(
+  content::JavaScriptDialogManager::DialogClosedCallback* dialog_ =
+      reinterpret_cast<content::JavaScriptDialogManager::DialogClosedCallback*>(
           dialogPointer);
   dialog_->Run(false, string16());
 }
 
 base::android::ScopedJavaLocalRef<jobject> createJsResultHandler(
     JNIEnv* env,
-    const content::JavaScriptDialogCreator::DialogClosedCallback* dialog) {
+    const content::JavaScriptDialogManager::DialogClosedCallback* dialog) {
   return Java_JsResultHandler_create(env, reinterpret_cast<jint>(dialog));
 }
 
diff --git a/android_webview/native/js_result_handler.h b/android_webview/native/js_result_handler.h
index c85b116..4bd478f 100644
--- a/android_webview/native/js_result_handler.h
+++ b/android_webview/native/js_result_handler.h
@@ -7,7 +7,7 @@
 
 #include "base/android/jni_helper.h"
 #include "base/android/scoped_java_ref.h"
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 
 namespace android_webview {
 
@@ -15,7 +15,7 @@ bool RegisterJsResultHandler(JNIEnv* env);
 
 base::android::ScopedJavaLocalRef<jobject> createJsResultHandler(
     JNIEnv* env,
-    const content::JavaScriptDialogCreator::DialogClosedCallback*
+    const content::JavaScriptDialogManager::DialogClosedCallback*
         native_dialog_pointer);
 
 }  // namespace android_webview
diff --git a/android_webview/native/webview_native.gyp b/android_webview/native/webview_native.gyp
index 431f966..5b3a1df 100644
--- a/android_webview/native/webview_native.gyp
+++ b/android_webview/native/webview_native.gyp
@@ -36,8 +36,8 @@
         'aw_geolocation_permission_context.h',
         'aw_http_auth_handler.cc',
         'aw_http_auth_handler.h',
-        'aw_javascript_dialog_creator.cc',
-        'aw_javascript_dialog_creator.h',
+        'aw_javascript_dialog_manager.cc',
+        'aw_javascript_dialog_manager.h',
         'aw_resource.cc',
         'aw_resource.h',
         'aw_web_contents_delegate.cc',
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.cc b/chrome/browser/android/chrome_web_contents_delegate_android.cc
index 6b9acbf..0487aed 100644
--- a/chrome/browser/android/chrome_web_contents_delegate_android.cc
+++ b/chrome/browser/android/chrome_web_contents_delegate_android.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/file_select_helper.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
+#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/find_bar/find_match_rects_details.h"
 #include "chrome/browser/ui/find_bar/find_notification_details.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
@@ -258,9 +258,9 @@ void ChromeWebContentsDelegateAndroid::FindMatchRectsReply(
       details_object.obj());
 }
 
-content::JavaScriptDialogCreator*
-ChromeWebContentsDelegateAndroid::GetJavaScriptDialogCreator() {
-  return GetJavaScriptDialogCreatorInstance();
+content::JavaScriptDialogManager*
+ChromeWebContentsDelegateAndroid::GetJavaScriptDialogManager() {
+  return GetJavaScriptDialogManagerInstance();
 }
 
 bool ChromeWebContentsDelegateAndroid::CanDownload(
diff --git a/chrome/browser/android/chrome_web_contents_delegate_android.h b/chrome/browser/android/chrome_web_contents_delegate_android.h
index 04b56f8..afcc911 100644
--- a/chrome/browser/android/chrome_web_contents_delegate_android.h
+++ b/chrome/browser/android/chrome_web_contents_delegate_android.h
@@ -51,8 +51,8 @@ class ChromeWebContentsDelegateAndroid
                                    int version,
                                    const std::vector<gfx::RectF>& rects,
                                    const gfx::RectF& active_rect) OVERRIDE;
-  virtual content::JavaScriptDialogCreator*
-  GetJavaScriptDialogCreator() OVERRIDE;
+  virtual content::JavaScriptDialogManager*
+  GetJavaScriptDialogManager() OVERRIDE;
   virtual bool CanDownload(content::RenderViewHost* source,
                            int request_id,
                            const std::string& request_method) OVERRIDE;
diff --git a/chrome/browser/devtools/devtools_window.cc b/chrome/browser/devtools/devtools_window.cc
index 1b09a37..cc00eff 100644
--- a/chrome/browser/devtools/devtools_window.cc
+++ b/chrome/browser/devtools/devtools_window.cc
@@ -913,12 +913,12 @@ void DevToolsWindow::FileSystemAdded(
     delete file_system_value;
 }
 
-content::JavaScriptDialogCreator* DevToolsWindow::GetJavaScriptDialogCreator() {
+content::JavaScriptDialogManager* DevToolsWindow::GetJavaScriptDialogManager() {
   if (inspected_web_contents_ && inspected_web_contents_->GetDelegate()) {
     return inspected_web_contents_->GetDelegate()->
-        GetJavaScriptDialogCreator();
+        GetJavaScriptDialogManager();
   }
-  return content::WebContentsDelegate::GetJavaScriptDialogCreator();
+  return content::WebContentsDelegate::GetJavaScriptDialogManager();
 }
 
 void DevToolsWindow::RunFileChooser(WebContents* web_contents,
diff --git a/chrome/browser/devtools/devtools_window.h b/chrome/browser/devtools/devtools_window.h
index c1aa383..fbe75a9 100644
--- a/chrome/browser/devtools/devtools_window.h
+++ b/chrome/browser/devtools/devtools_window.h
@@ -163,8 +163,8 @@ class DevToolsWindow : private content::NotificationObserver,
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual content::JavaScriptDialogCreator*
-      GetJavaScriptDialogCreator() OVERRIDE;
+  virtual content::JavaScriptDialogManager*
+      GetJavaScriptDialogManager() OVERRIDE;
   virtual void RunFileChooser(
       content::WebContents* web_contents,
       const content::FileChooserParams& params) OVERRIDE;
diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc
index d8abc32..99c8da6 100644
--- a/chrome/browser/extensions/extension_host.cc
+++ b/chrome/browser/extensions/extension_host.cc
@@ -24,7 +24,7 @@
 #include "chrome/browser/intents/web_intents_util.h"
 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
+#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -594,11 +594,11 @@ void ExtensionHost::RenderViewDeleted(RenderViewHost* render_view_host) {
     render_view_host_ = host_contents_->GetRenderViewHost();
 }
 
-content::JavaScriptDialogCreator* ExtensionHost::GetJavaScriptDialogCreator() {
-  if (!dialog_creator_.get()) {
-    dialog_creator_.reset(CreateJavaScriptDialogCreatorInstance(this));
+content::JavaScriptDialogManager* ExtensionHost::GetJavaScriptDialogManager() {
+  if (!dialog_manager_.get()) {
+    dialog_manager_.reset(CreateJavaScriptDialogManagerInstance(this));
   }
-  return dialog_creator_.get();
+  return dialog_manager_.get();
 }
 
 void ExtensionHost::RunFileChooser(WebContents* tab,
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 12b43c9..d9ff3ca 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -13,7 +13,7 @@
 #include "base/perftimer.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/common/view_type.h"
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ -124,7 +124,7 @@ class ExtensionHost : public content::WebContentsDelegate,
   // Insert a default style sheet for Extension Infobars.
   void InsertInfobarCSS();
 
-  // Notifications from the JavaScriptDialogCreator when a dialog is being
+  // Notifications from the JavaScriptDialogManager when a dialog is being
   // opened/closed.
   void WillRunJavaScriptDialog();
   void DidCloseJavaScriptDialog();
@@ -154,8 +154,8 @@ class ExtensionHost : public content::WebContentsDelegate,
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual void ResizeDueToAutoResize(content::WebContents* source,
                                      const gfx::Size& new_size) OVERRIDE;
-  virtual content::JavaScriptDialogCreator*
-      GetJavaScriptDialogCreator() OVERRIDE;
+  virtual content::JavaScriptDialogManager*
+      GetJavaScriptDialogManager() OVERRIDE;
   virtual void RunFileChooser(
       content::WebContents* tab,
       const content::FileChooserParams& params) OVERRIDE;
@@ -229,7 +229,7 @@ class ExtensionHost : public content::WebContentsDelegate,
   // Used to create dialog boxes.
   // It must outlive host_contents_ as host_contents_ will access it
   // during destruction.
-  scoped_ptr<content::JavaScriptDialogCreator> dialog_creator_;
+  scoped_ptr<content::JavaScriptDialogManager> dialog_manager_;
 
   // The host for our HTML content.
   scoped_ptr<content::WebContents> host_contents_;
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc
index be2c7e8..016ffe5 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc
@@ -14,7 +14,7 @@
 #include "ui/aura/root_window.h"
 #endif
 
-using content::JavaScriptDialogCreator;
+using content::JavaScriptDialogManager;
 using content::WebContents;
 
 namespace {
@@ -65,7 +65,7 @@ JavaScriptAppModalDialog::JavaScriptAppModalDialog(
     bool display_suppress_checkbox,
     bool is_before_unload_dialog,
     bool is_reload,
-    const JavaScriptDialogCreator::DialogClosedCallback& callback)
+    const JavaScriptDialogManager::DialogClosedCallback& callback)
     : AppModalDialog(web_contents, title),
       extra_data_(extra_data),
       javascript_message_type_(javascript_message_type),
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h
index ed1a617..9236786 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h
@@ -9,7 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/time.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 
 // Extra data for JavaScript dialogs to add Chrome-only features.
 class ChromeJavaScriptDialogExtraData {
@@ -37,7 +37,7 @@ class JavaScriptAppModalDialog : public AppModalDialog {
       bool display_suppress_checkbox,
       bool is_before_unload_dialog,
       bool is_reload,
-      const content::JavaScriptDialogCreator::DialogClosedCallback& callback);
+      const content::JavaScriptDialogManager::DialogClosedCallback& callback);
   virtual ~JavaScriptAppModalDialog();
 
   // Overridden from AppModalDialog:
@@ -83,7 +83,7 @@ class JavaScriptAppModalDialog : public AppModalDialog {
   bool is_before_unload_dialog_;
   bool is_reload_;
 
-  content::JavaScriptDialogCreator::DialogClosedCallback callback_;
+  content::JavaScriptDialogManager::DialogClosedCallback callback_;
 
   // Used only for testing. Specifies alternative prompt text that should be
   // used when notifying the delegate, if |use_override_prompt_text_| is true.
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h
deleted file mode 100644
index a01de88..0000000
--- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_CREATOR_H_
-#define CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_CREATOR_H_
-
-namespace content {
-class JavaScriptDialogCreator;
-}
-
-namespace extensions {
-class ExtensionHost;
-}
-
-// Returns a JavaScriptDialogCreator that creates real dialogs.
-// It returns a Singleton instance of JavaScriptDialogCreator,
-// which should not be deleted.
-content::JavaScriptDialogCreator* GetJavaScriptDialogCreatorInstance();
-
-// Creates and returns a JavaScriptDialogCreator owned by |extension_host|.
-// This is not the Singleton instance, so the caller must delete it.
-content::JavaScriptDialogCreator* CreateJavaScriptDialogCreatorInstance(
-    extensions::ExtensionHost* extension_host);
-
-#endif  // CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_CREATOR_H_
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
index 069e16e..c044a80 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.cc
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
@@ -2,7 +2,7 @@
 // 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_dialogs/javascript_dialog_creator.h"
+#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 
 #include <map>
 
@@ -25,19 +25,19 @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
-using content::JavaScriptDialogCreator;
+using content::JavaScriptDialogManager;
 using content::WebContents;
 
 namespace {
 
-class ChromeJavaScriptDialogCreator : public JavaScriptDialogCreator,
+class ChromeJavaScriptDialogManager : public JavaScriptDialogManager,
                                       public content::NotificationObserver {
  public:
-  static ChromeJavaScriptDialogCreator* GetInstance();
+  static ChromeJavaScriptDialogManager* GetInstance();
 
-  explicit ChromeJavaScriptDialogCreator(
+  explicit ChromeJavaScriptDialogManager(
       extensions::ExtensionHost* extension_host);
-  virtual ~ChromeJavaScriptDialogCreator();
+  virtual ~ChromeJavaScriptDialogManager();
 
   virtual void RunJavaScriptDialog(
       WebContents* web_contents,
@@ -58,9 +58,9 @@ class ChromeJavaScriptDialogCreator : public JavaScriptDialogCreator,
   virtual void ResetJavaScriptState(WebContents* web_contents) OVERRIDE;
 
  private:
-  ChromeJavaScriptDialogCreator();
+  ChromeJavaScriptDialogManager();
 
-  friend struct DefaultSingletonTraits<ChromeJavaScriptDialogCreator>;
+  friend struct DefaultSingletonTraits<ChromeJavaScriptDialogManager>;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
@@ -85,28 +85,28 @@ class ChromeJavaScriptDialogCreator : public JavaScriptDialogCreator,
       JavaScriptDialogExtraDataMap;
   JavaScriptDialogExtraDataMap javascript_dialog_extra_data_;
 
-  // Extension Host which owns the ChromeJavaScriptDialogCreator instance.
+  // Extension Host which owns the ChromeJavaScriptDialogManager instance.
   // It's used to get a extension name from a URL.
   // If it's not owned by any Extension, it should be NULL.
   extensions::ExtensionHost* extension_host_;
 
   content::NotificationRegistrar registrar_;
 
-  DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptDialogCreator);
+  DISALLOW_COPY_AND_ASSIGN(ChromeJavaScriptDialogManager);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
-// ChromeJavaScriptDialogCreator, public:
+// ChromeJavaScriptDialogManager, public:
 
-ChromeJavaScriptDialogCreator::ChromeJavaScriptDialogCreator()
+ChromeJavaScriptDialogManager::ChromeJavaScriptDialogManager()
     : extension_host_(NULL) {
 }
 
-ChromeJavaScriptDialogCreator::~ChromeJavaScriptDialogCreator() {
+ChromeJavaScriptDialogManager::~ChromeJavaScriptDialogManager() {
   extension_host_ = NULL;
 }
 
-ChromeJavaScriptDialogCreator::ChromeJavaScriptDialogCreator(
+ChromeJavaScriptDialogManager::ChromeJavaScriptDialogManager(
     extensions::ExtensionHost* extension_host)
     : extension_host_(extension_host) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DESTROYED,
@@ -114,11 +114,11 @@ ChromeJavaScriptDialogCreator::ChromeJavaScriptDialogCreator(
 }
 
 // static
-ChromeJavaScriptDialogCreator* ChromeJavaScriptDialogCreator::GetInstance() {
-  return Singleton<ChromeJavaScriptDialogCreator>::get();
+ChromeJavaScriptDialogManager* ChromeJavaScriptDialogManager::GetInstance() {
+  return Singleton<ChromeJavaScriptDialogManager>::get();
 }
 
-void ChromeJavaScriptDialogCreator::RunJavaScriptDialog(
+void ChromeJavaScriptDialogManager::RunJavaScriptDialog(
     WebContents* web_contents,
     const GURL& origin_url,
     const std::string& accept_lang,
@@ -164,11 +164,11 @@ void ChromeJavaScriptDialogCreator::RunJavaScriptDialog(
       display_suppress_checkbox,
       false,  // is_before_unload_dialog
       false,  // is_reload
-      base::Bind(&ChromeJavaScriptDialogCreator::OnDialogClosed,
+      base::Bind(&ChromeJavaScriptDialogManager::OnDialogClosed,
                  base::Unretained(this), callback)));
 }
 
-void ChromeJavaScriptDialogCreator::RunBeforeUnloadDialog(
+void ChromeJavaScriptDialogManager::RunBeforeUnloadDialog(
     WebContents* web_contents,
     const string16& message_text,
     bool is_reload,
@@ -196,17 +196,17 @@ void ChromeJavaScriptDialogCreator::RunBeforeUnloadDialog(
       false,       // display_suppress_checkbox
       true,        // is_before_unload_dialog
       is_reload,
-      base::Bind(&ChromeJavaScriptDialogCreator::OnDialogClosed,
+      base::Bind(&ChromeJavaScriptDialogManager::OnDialogClosed,
                  base::Unretained(this), callback)));
 }
 
-void ChromeJavaScriptDialogCreator::ResetJavaScriptState(
+void ChromeJavaScriptDialogManager::ResetJavaScriptState(
     WebContents* web_contents) {
   CancelPendingDialogs(web_contents);
   javascript_dialog_extra_data_.erase(web_contents);
 }
 
-void ChromeJavaScriptDialogCreator::Observe(
+void ChromeJavaScriptDialogManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
@@ -214,7 +214,7 @@ void ChromeJavaScriptDialogCreator::Observe(
   extension_host_ = NULL;
 }
 
-string16 ChromeJavaScriptDialogCreator::GetTitle(const GURL& origin_url,
+string16 ChromeJavaScriptDialogManager::GetTitle(const GURL& origin_url,
                                                  const std::string& accept_lang,
                                                  bool is_alert) {
   // If the URL hasn't any host, return the default string.
@@ -243,7 +243,7 @@ string16 ChromeJavaScriptDialogCreator::GetTitle(const GURL& origin_url,
       base::i18n::GetDisplayStringInLTRDirectionality(url_string));
 }
 
-void ChromeJavaScriptDialogCreator::CancelPendingDialogs(
+void ChromeJavaScriptDialogManager::CancelPendingDialogs(
     WebContents* web_contents) {
   AppModalDialogQueue* queue = AppModalDialogQueue::GetInstance();
   AppModalDialog* active_dialog = queue->active_dialog();
@@ -256,7 +256,7 @@ void ChromeJavaScriptDialogCreator::CancelPendingDialogs(
   }
 }
 
-void ChromeJavaScriptDialogCreator::OnDialogClosed(
+void ChromeJavaScriptDialogManager::OnDialogClosed(
     DialogClosedCallback callback,
     bool success,
     const string16& user_input) {
@@ -267,11 +267,11 @@ void ChromeJavaScriptDialogCreator::OnDialogClosed(
 
 }  // namespace
 
-content::JavaScriptDialogCreator* GetJavaScriptDialogCreatorInstance() {
-  return ChromeJavaScriptDialogCreator::GetInstance();
+content::JavaScriptDialogManager* GetJavaScriptDialogManagerInstance() {
+  return ChromeJavaScriptDialogManager::GetInstance();
 }
 
-content::JavaScriptDialogCreator* CreateJavaScriptDialogCreatorInstance(
+content::JavaScriptDialogManager* CreateJavaScriptDialogManagerInstance(
     extensions::ExtensionHost* extension_host) {
-  return new ChromeJavaScriptDialogCreator(extension_host);
+  return new ChromeJavaScriptDialogManager(extension_host);
 }
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h
new file mode 100644
index 0000000..f9b5079
--- /dev/null
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h
@@ -0,0 +1,26 @@
+// Copyright (c) 2012 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.
+
+#ifndef CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_MANAGER_H_
+#define CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_MANAGER_H_
+
+namespace content {
+class JavaScriptDialogManager;
+}
+
+namespace extensions {
+class ExtensionHost;
+}
+
+// Returns a JavaScriptDialogManager that creates real dialogs.
+// It returns a Singleton instance of JavaScriptDialogManager,
+// which should not be deleted.
+content::JavaScriptDialogManager* GetJavaScriptDialogManagerInstance();
+
+// Creates and returns a JavaScriptDialogManager owned by |extension_host|.
+// This is not the Singleton instance, so the caller must delete it.
+content::JavaScriptDialogManager* CreateJavaScriptDialogManagerInstance(
+    extensions::ExtensionHost* extension_host);
+
+#endif  // CHROME_BROWSER_UI_APP_MODAL_DIALOGS_JAVASCRIPT_DIALOG_MANAGER_H_
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 065b302..5343c29 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -88,7 +88,7 @@
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
+#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
 #include "chrome/browser/ui/browser_command_controller.h"
@@ -1527,8 +1527,8 @@ void Browser::DidNavigateToPendingEntry(WebContents* web_contents) {
     UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
 }
 
-content::JavaScriptDialogCreator* Browser::GetJavaScriptDialogCreator() {
-  return GetJavaScriptDialogCreatorInstance();
+content::JavaScriptDialogManager* Browser::GetJavaScriptDialogManager() {
+  return GetJavaScriptDialogManagerInstance();
 }
 
 content::ColorChooser* Browser::OpenColorChooser(WebContents* web_contents,
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index c4c1e72..1f54a73 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -588,8 +588,8 @@ class Browser : public TabStripModelObserver,
       content::WebContents* web_contents) OVERRIDE;
   virtual void DidNavigateToPendingEntry(
       content::WebContents* web_contents) OVERRIDE;
-  virtual content::JavaScriptDialogCreator*
-      GetJavaScriptDialogCreator() OVERRIDE;
+  virtual content::JavaScriptDialogManager*
+      GetJavaScriptDialogManager() OVERRIDE;
   virtual content::ColorChooser* OpenColorChooser(
       content::WebContents* web_contents,
       int color_chooser_id,
diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
index effcb60..a8e957b 100644
--- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
+++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.cc
@@ -10,7 +10,7 @@
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/platform_util.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
+#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_util.h"
@@ -213,9 +213,9 @@ void DraggedTabControllerGtk::LoadingStateChanged(WebContents* source) {
     dragged_view_->Update();
 }
 
-content::JavaScriptDialogCreator*
-DraggedTabControllerGtk::GetJavaScriptDialogCreator() {
-  return GetJavaScriptDialogCreatorInstance();
+content::JavaScriptDialogManager*
+DraggedTabControllerGtk::GetJavaScriptDialogManager() {
+  return GetJavaScriptDialogManagerInstance();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h
index 5328a7f..4e757c6 100644
--- a/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h
+++ b/chrome/browser/ui/gtk/tabs/dragged_tab_controller_gtk.h
@@ -95,8 +95,8 @@ class DraggedTabControllerGtk : public content::NotificationObserver,
                               bool user_gesture,
                               bool* was_blocked) OVERRIDE;
   virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
-  virtual content::JavaScriptDialogCreator*
-      GetJavaScriptDialogCreator() OVERRIDE;
+  virtual content::JavaScriptDialogManager*
+      GetJavaScriptDialogManager() OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
diff --git a/chrome/browser/ui/views/external_tab_container_win.cc b/chrome/browser/ui/views/external_tab_container_win.cc
index f2a6ce4..2500c58 100644
--- a/chrome/browser/ui/views/external_tab_container_win.cc
+++ b/chrome/browser/ui/views/external_tab_container_win.cc
@@ -30,7 +30,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/repost_form_warning_controller.h"
 #include "chrome/browser/themes/theme_service.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
+#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tab_contents.h"
@@ -694,9 +694,9 @@ void ExternalTabContainerWin::UnregisterRenderViewHost(
   }
 }
 
-content::JavaScriptDialogCreator*
-ExternalTabContainerWin::GetJavaScriptDialogCreator() {
-  return GetJavaScriptDialogCreatorInstance();
+content::JavaScriptDialogManager*
+ExternalTabContainerWin::GetJavaScriptDialogManager() {
+  return GetJavaScriptDialogManagerInstance();
 }
 
 bool ExternalTabContainerWin::HandleContextMenu(
diff --git a/chrome/browser/ui/views/external_tab_container_win.h b/chrome/browser/ui/views/external_tab_container_win.h
index 36fd1a9..defd499b 100644
--- a/chrome/browser/ui/views/external_tab_container_win.h
+++ b/chrome/browser/ui/views/external_tab_container_win.h
@@ -145,8 +145,8 @@ class ExternalTabContainerWin : public ExternalTabContainer,
   virtual void BeforeUnloadFired(content::WebContents* tab,
                                  bool proceed,
                                  bool* proceed_to_fire_unload) OVERRIDE;
-  virtual content::JavaScriptDialogCreator*
-      GetJavaScriptDialogCreator() OVERRIDE;
+  virtual content::JavaScriptDialogManager*
+      GetJavaScriptDialogManager() OVERRIDE;
   virtual void ShowRepostFormWarningDialog(
       content::WebContents* source) OVERRIDE;
   virtual void RunFileChooser(
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 642cbc9..c3980924 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -12,7 +12,7 @@
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
-#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_creator.h"
+#include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
@@ -598,9 +598,9 @@ bool TabDragController::ShouldSuppressDialogs() {
   return false;
 }
 
-content::JavaScriptDialogCreator*
-TabDragController::GetJavaScriptDialogCreator() {
-  return GetJavaScriptDialogCreatorInstance();
+content::JavaScriptDialogManager*
+TabDragController::GetJavaScriptDialogManager() {
+  return GetJavaScriptDialogManagerInstance();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.h b/chrome/browser/ui/views/tabs/tab_drag_controller.h
index 7bb12f0..e7ce9c5 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.h
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.h
@@ -230,8 +230,8 @@ class TabDragController : public content::WebContentsDelegate,
                               bool* was_blocked) OVERRIDE;
   virtual void LoadingStateChanged(content::WebContents* source) OVERRIDE;
   virtual bool ShouldSuppressDialogs() OVERRIDE;
-  virtual content::JavaScriptDialogCreator*
-      GetJavaScriptDialogCreator() OVERRIDE;
+  virtual content::JavaScriptDialogManager*
+      GetJavaScriptDialogManager() OVERRIDE;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index aac88e0..81f67d3 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -116,8 +116,8 @@
         'browser/ui/app_modal_dialogs/app_modal_dialog_queue.h',
         'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.cc',
         'browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h',
-        'browser/ui/app_modal_dialogs/javascript_dialog_creator.cc',
-        'browser/ui/app_modal_dialogs/javascript_dialog_creator.h',
+        'browser/ui/app_modal_dialogs/javascript_dialog_manager.cc',
+        'browser/ui/app_modal_dialogs/javascript_dialog_manager.h',
         'browser/ui/app_modal_dialogs/native_app_modal_dialog.h',
         'browser/ui/ash/app_icon_loader.h',
         'browser/ui/ash/app_icon_loader_impl.cc',
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 5a1278d..5c5289b 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -55,7 +55,7 @@
 #include "content/public/browser/download_manager.h"
 #include "content/public/browser/download_url_parameters.h"
 #include "content/public/browser/invalidate_type.h"
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/load_from_memory_cache_details.h"
 #include "content/public/browser/load_notification_details.h"
 #include "content/public/browser/navigation_details.h"
@@ -312,7 +312,7 @@ WebContentsImpl::WebContentsImpl(
       capturing_contents_(false),
       is_being_destroyed_(false),
       notify_disconnection_(false),
-      dialog_creator_(NULL),
+      dialog_manager_(NULL),
       is_showing_before_unload_dialog_(false),
       opener_web_ui_type_(WebUI::kNoWebUI),
       closed_by_user_gesture_(false),
@@ -334,8 +334,8 @@ WebContentsImpl::~WebContentsImpl() {
   created_widgets_.clear();
 
   // Clear out any JavaScript state.
-  if (dialog_creator_)
-    dialog_creator_->ResetJavaScriptState(this);
+  if (dialog_manager_)
+    dialog_manager_->ResetJavaScriptState(this);
 
   if (color_chooser_)
     color_chooser_->End();
@@ -2521,9 +2521,9 @@ void WebContentsImpl::DidNavigateAnyFramePostCommit(
   // If we navigate off the page, reset JavaScript state. This does nothing
   // to prevent a malicious script from spamming messages, since the script
   // could just reload the page to stop blocking.
-  if (dialog_creator_ && !details.is_in_page) {
-    dialog_creator_->ResetJavaScriptState(this);
-    dialog_creator_ = NULL;
+  if (dialog_manager_ && !details.is_in_page) {
+    dialog_manager_->ResetJavaScriptState(this);
+    dialog_manager_ = NULL;
   }
 
   // Notify observers about navigation.
@@ -3125,13 +3125,13 @@ void WebContentsImpl::RunJavaScriptMessage(
       ShowingInterstitialPage() ||
       !delegate_ ||
       delegate_->ShouldSuppressDialogs() ||
-      !delegate_->GetJavaScriptDialogCreator();
+      !delegate_->GetJavaScriptDialogManager();
 
   if (!suppress_this_message) {
     std::string accept_lang = GetContentClient()->browser()->
       GetAcceptLangs(GetBrowserContext());
-    dialog_creator_ = delegate_->GetJavaScriptDialogCreator();
-    dialog_creator_->RunJavaScriptDialog(
+    dialog_manager_ = delegate_->GetJavaScriptDialogManager();
+    dialog_manager_->RunJavaScriptDialog(
         this,
         frame_url.GetOrigin(),
         accept_lang,
@@ -3166,7 +3166,7 @@ void WebContentsImpl::RunBeforeUnloadConfirm(RenderViewHost* rvh,
       rvhi->is_swapped_out() ||
       !delegate_ ||
       delegate_->ShouldSuppressDialogs() ||
-      !delegate_->GetJavaScriptDialogCreator();
+      !delegate_->GetJavaScriptDialogManager();
   if (suppress_this_message) {
     // The reply must be sent to the RVH that sent the request.
     rvhi->JavaScriptDialogClosed(reply_msg, true, string16());
@@ -3174,8 +3174,8 @@ void WebContentsImpl::RunBeforeUnloadConfirm(RenderViewHost* rvh,
   }
 
   is_showing_before_unload_dialog_ = true;
-  dialog_creator_ = delegate_->GetJavaScriptDialogCreator();
-  dialog_creator_->RunBeforeUnloadDialog(
+  dialog_manager_ = delegate_->GetJavaScriptDialogManager();
+  dialog_manager_->RunBeforeUnloadDialog(
       this, message, is_reload,
       base::Bind(&WebContentsImpl::OnDialogClosed, base::Unretained(this), rvh,
                  reply_msg));
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 847b11f..b25ff17 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -46,7 +46,7 @@ class DateTimeChooserAndroid;
 class DownloadItem;
 class InterstitialPageImpl;
 class JavaBridgeDispatcherHostManager;
-class JavaScriptDialogCreator;
+class JavaScriptDialogManager;
 class RenderViewHost;
 class RenderViewHostDelegateView;
 class RenderViewHostImpl;
@@ -796,9 +796,9 @@ class CONTENT_EXPORT WebContentsImpl
   // once.
   bool notify_disconnection_;
 
-  // Pointer to the JavaScript dialog creator, lazily assigned. Used because the
+  // Pointer to the JavaScript dialog manager, lazily assigned. Used because the
   // delegate of this WebContentsImpl is nulled before its destructor is called.
-  JavaScriptDialogCreator* dialog_creator_;
+  JavaScriptDialogManager* dialog_manager_;
 
   // Set to true when there is an active "before unload" dialog.  When true,
   // we've forced the throbber to start in Navigate, and we need to remember to
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index e59ec9a..097529e 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -89,7 +89,7 @@
     'public/browser/indexed_db_context.h',
     'public/browser/interstitial_page.h',
     'public/browser/invalidate_type.h',
-    'public/browser/javascript_dialogs.h',
+    'public/browser/javascript_dialog_manager.h',
     'public/browser/keyboard_listener.h',
     'public/browser/load_from_memory_cache_details.cc',
     'public/browser/load_from_memory_cache_details.h',
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index d0d5985..6c8d3e3 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -91,8 +91,8 @@
         'shell/shell_devtools_frontend.h',
         'shell/shell_download_manager_delegate.cc',
         'shell/shell_download_manager_delegate.h',
-        'shell/shell_javascript_dialog_creator.cc',
-        'shell/shell_javascript_dialog_creator.h',
+        'shell/shell_javascript_dialog_manager.cc',
+        'shell/shell_javascript_dialog_manager.h',
         'shell/shell_javascript_dialog_gtk.cc',
         'shell/shell_javascript_dialog_mac.mm',
         'shell/shell_javascript_dialog_win.cc',
diff --git a/content/public/browser/javascript_dialogs.h b/content/public/browser/javascript_dialog_manager.h
index 9c67d93..64f7b9b 100644
--- a/content/public/browser/javascript_dialogs.h
+++ b/content/public/browser/javascript_dialog_manager.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOGS_H_
-#define CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOGS_H_
+#ifndef CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOG_MANAGER_H_
+#define CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOG_MANAGER_H_
 
 #include <string>
 
@@ -18,9 +18,9 @@ namespace content {
 
 class WebContents;
 
-// An interface consisting of methods that can be called to produce JavaScript
-// dialogs.
-class JavaScriptDialogCreator {
+// An interface consisting of methods that can be called to produce and manage
+// JavaScript dialogs.
+class JavaScriptDialogManager {
  public:
   typedef base::Callback<void(bool /* success */,
                               const string16& /* user_input */)>
@@ -48,9 +48,9 @@ class JavaScriptDialogCreator {
   // for the given WebContents.
   virtual void ResetJavaScriptState(WebContents* web_contents) = 0;
 
-  virtual ~JavaScriptDialogCreator() {}
+  virtual ~JavaScriptDialogManager() {}
 };
 
 }  // namespace content
 
-#endif  // CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOGS_H_
+#endif  // CONTENT_PUBLIC_BROWSER_JAVASCRIPT_DIALOG_MANAGER_H_
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index e617e82..9a2a950 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -121,7 +121,7 @@ bool WebContentsDelegate::ShouldCreateWebContents(
   return true;
 }
 
-JavaScriptDialogCreator* WebContentsDelegate::GetJavaScriptDialogCreator() {
+JavaScriptDialogManager* WebContentsDelegate::GetJavaScriptDialogManager() {
   return NULL;
 }
 
diff --git a/content/public/browser/web_contents_delegate.h b/content/public/browser/web_contents_delegate.h
index a1fe147..ba57196 100644
--- a/content/public/browser/web_contents_delegate.h
+++ b/content/public/browser/web_contents_delegate.h
@@ -32,7 +32,7 @@ namespace content {
 class BrowserContext;
 class ColorChooser;
 class DownloadItem;
-class JavaScriptDialogCreator;
+class JavaScriptDialogManager;
 class RenderViewHost;
 class WebContents;
 class WebContentsImpl;
@@ -315,9 +315,9 @@ class CONTENT_EXPORT WebContentsDelegate {
   // been committed.
   virtual void DidNavigateToPendingEntry(WebContents* source) {}
 
-  // Returns a pointer to a service to create JavaScript dialogs. May return
+  // Returns a pointer to a service to manage JavaScript dialogs. May return
   // NULL in which case dialogs aren't shown.
-  virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator();
+  virtual JavaScriptDialogManager* GetJavaScriptDialogManager();
 
   // Called when color chooser should open. Returns the opened color chooser.
   // Ownership of the returned pointer is transferred to the caller.
diff --git a/content/shell/shell.cc b/content/shell/shell.cc
index 91bd36d..0e94316 100644
--- a/content/shell/shell.cc
+++ b/content/shell/shell.cc
@@ -25,7 +25,7 @@
 #include "content/shell/shell_browser_main_parts.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/shell/shell_devtools_frontend.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
 #include "content/shell/shell_messages.h"
 #include "content/shell/shell_switches.h"
 #include "content/shell/webkit_test_controller.h"
@@ -265,10 +265,10 @@ void Shell::DidNavigateMainFramePostCommit(WebContents* web_contents) {
   PlatformSetAddressBarURL(web_contents->GetURL());
 }
 
-JavaScriptDialogCreator* Shell::GetJavaScriptDialogCreator() {
-  if (!dialog_creator_.get())
-    dialog_creator_.reset(new ShellJavaScriptDialogCreator());
-  return dialog_creator_.get();
+JavaScriptDialogManager* Shell::GetJavaScriptDialogManager() {
+  if (!dialog_manager_.get())
+    dialog_manager_.reset(new ShellJavaScriptDialogManager());
+  return dialog_manager_.get();
 }
 
 bool Shell::AddMessageToConsole(WebContents* source,
diff --git a/content/shell/shell.h b/content/shell/shell.h
index f342613..2a3ccd1 100644
--- a/content/shell/shell.h
+++ b/content/shell/shell.h
@@ -42,7 +42,7 @@ namespace content {
 
 class BrowserContext;
 class ShellDevToolsFrontend;
-class ShellJavaScriptDialogCreator;
+class ShellJavaScriptDialogManager;
 class SiteInstance;
 class WebContents;
 
@@ -122,7 +122,7 @@ class Shell : public WebContentsDelegate,
                                   WebContents* new_contents) OVERRIDE;
   virtual void DidNavigateMainFramePostCommit(
       WebContents* web_contents) OVERRIDE;
-  virtual JavaScriptDialogCreator* GetJavaScriptDialogCreator() OVERRIDE;
+  virtual JavaScriptDialogManager* GetJavaScriptDialogManager() OVERRIDE;
 #if defined(OS_MACOSX)
   virtual void HandleKeyboardEvent(
       WebContents* source,
@@ -207,7 +207,7 @@ class Shell : public WebContentsDelegate,
                      GObject*, guint, GdkModifierType);
 #endif
 
-  scoped_ptr<ShellJavaScriptDialogCreator> dialog_creator_;
+  scoped_ptr<ShellJavaScriptDialogManager> dialog_manager_;
 
   scoped_ptr<WebContents> web_contents_;
 
diff --git a/content/shell/shell_javascript_dialog.h b/content/shell/shell_javascript_dialog.h
index 68fe2ea..b819f3b 100644
--- a/content/shell/shell_javascript_dialog.h
+++ b/content/shell/shell_javascript_dialog.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_
 #define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_H_
 
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 
 #if defined(TOOLKIT_GTK)
 #include "ui/base/gtk/gtk_signal.h"
@@ -21,25 +21,25 @@ class ShellJavaScriptDialogHelper;
 
 namespace content {
 
-class ShellJavaScriptDialogCreator;
+class ShellJavaScriptDialogManager;
 
 class ShellJavaScriptDialog {
  public:
   ShellJavaScriptDialog(
-      ShellJavaScriptDialogCreator* creator,
+      ShellJavaScriptDialogManager* manager,
       gfx::NativeWindow parent_window,
       JavaScriptMessageType message_type,
       const string16& message_text,
       const string16& default_prompt_text,
-      const JavaScriptDialogCreator::DialogClosedCallback& callback);
+      const JavaScriptDialogManager::DialogClosedCallback& callback);
   ~ShellJavaScriptDialog();
 
   // Called to cancel a dialog mid-flight.
   void Cancel();
 
  private:
-  ShellJavaScriptDialogCreator* creator_;
-  JavaScriptDialogCreator::DialogClosedCallback callback_;
+  ShellJavaScriptDialogManager* manager_;
+  JavaScriptDialogManager::DialogClosedCallback callback_;
 
 #if defined(OS_MACOSX)
   ShellJavaScriptDialogHelper* helper_;  // owned
diff --git a/content/shell/shell_javascript_dialog_gtk.cc b/content/shell/shell_javascript_dialog_gtk.cc
index 3fdaddd..624c222 100644
--- a/content/shell/shell_javascript_dialog_gtk.cc
+++ b/content/shell/shell_javascript_dialog_gtk.cc
@@ -11,7 +11,7 @@
 #include "base/utf_string_conversions.h"
 #include "content/shell/resource.h"
 #include "content/shell/shell.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
 
 namespace {
 
@@ -33,13 +33,13 @@ string16 GetPromptText(GtkDialog* dialog) {
 namespace content {
 
 ShellJavaScriptDialog::ShellJavaScriptDialog(
-    ShellJavaScriptDialogCreator* creator,
+    ShellJavaScriptDialogManager* manager,
     gfx::NativeWindow parent_window,
     JavaScriptMessageType message_type,
     const string16& message_text,
     const string16& default_prompt_text,
-    const JavaScriptDialogCreator::DialogClosedCallback& callback)
-    : creator_(creator),
+    const JavaScriptDialogManager::DialogClosedCallback& callback)
+    : manager_(manager),
       callback_(callback),
       parent_window_(parent_window) {
   GtkButtonsType buttons = GTK_BUTTONS_NONE;
@@ -121,7 +121,7 @@ void ShellJavaScriptDialog::OnResponse(GtkWidget* dialog, int response_id) {
 
   gtk_widget_destroy(dialog);
 
-  creator_->DialogClosed(this);
+  manager_->DialogClosed(this);
 }
 
 }  // namespace content
diff --git a/content/shell/shell_javascript_dialog_mac.mm b/content/shell/shell_javascript_dialog_mac.mm
index 1aa0840..920bb66 100644
--- a/content/shell/shell_javascript_dialog_mac.mm
+++ b/content/shell/shell_javascript_dialog_mac.mm
@@ -8,7 +8,7 @@
 
 #import "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
 
 // Helper object that receives the notification that the dialog/sheet is
 // going away. Is responsible for cleaning itself up.
@@ -18,12 +18,12 @@
   NSTextField* textField_;  // WEAK; owned by alert_
 
   // Copies of the fields in ShellJavaScriptDialog because they're private.
-  content::ShellJavaScriptDialogCreator* creator_;
-  content::JavaScriptDialogCreator::DialogClosedCallback callback_;
+  content::ShellJavaScriptDialogManager* manager_;
+  content::JavaScriptDialogManager::DialogClosedCallback callback_;
 }
 
-- (id)initHelperWithCreator:(content::ShellJavaScriptDialogCreator*)creator
-   andCallback:(content::JavaScriptDialogCreator::DialogClosedCallback)callback;
+- (id)initHelperWithManager:(content::ShellJavaScriptDialogManager*)manager
+   andCallback:(content::JavaScriptDialogManager::DialogClosedCallback)callback;
 - (NSAlert*)alert;
 - (NSTextField*)textField;
 - (void)alertDidEnd:(NSAlert*)alert
@@ -35,10 +35,10 @@
 
 @implementation ShellJavaScriptDialogHelper
 
-- (id)initHelperWithCreator:(content::ShellJavaScriptDialogCreator*)creator
-  andCallback:(content::JavaScriptDialogCreator::DialogClosedCallback)callback {
+- (id)initHelperWithManager:(content::ShellJavaScriptDialogManager*)manager
+  andCallback:(content::JavaScriptDialogManager::DialogClosedCallback)callback {
   if (self = [super init]) {
-    creator_ = creator;
+    manager_ = manager;
     callback_ = callback;
   }
 
@@ -73,7 +73,7 @@
   content::ShellJavaScriptDialog* native_dialog =
       reinterpret_cast<content::ShellJavaScriptDialog*>(contextInfo);
   callback_.Run(success, input);
-  creator_->DialogClosed(native_dialog);
+  manager_->DialogClosed(native_dialog);
 }
 
 - (void)cancel {
@@ -86,19 +86,19 @@
 namespace content {
 
 ShellJavaScriptDialog::ShellJavaScriptDialog(
-    ShellJavaScriptDialogCreator* creator,
+    ShellJavaScriptDialogManager* manager,
     gfx::NativeWindow parent_window,
     JavaScriptMessageType message_type,
     const string16& message_text,
     const string16& default_prompt_text,
-    const JavaScriptDialogCreator::DialogClosedCallback& callback)
-    : creator_(creator),
+    const JavaScriptDialogManager::DialogClosedCallback& callback)
+    : manager_(manager),
       callback_(callback) {
   bool text_field = message_type == JAVASCRIPT_MESSAGE_TYPE_PROMPT;
   bool one_button = message_type == JAVASCRIPT_MESSAGE_TYPE_ALERT;
 
   helper_ =
-      [[ShellJavaScriptDialogHelper alloc] initHelperWithCreator:creator
+      [[ShellJavaScriptDialogHelper alloc] initHelperWithManager:manager
                                                      andCallback:callback];
 
   // Show the modal dialog.
diff --git a/content/shell/shell_javascript_dialog_creator.cc b/content/shell/shell_javascript_dialog_manager.cc
index 6013bfa..bb85a28 100644
--- a/content/shell/shell_javascript_dialog_creator.cc
+++ b/content/shell/shell_javascript_dialog_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ -16,13 +16,13 @@
 
 namespace content {
 
-ShellJavaScriptDialogCreator::ShellJavaScriptDialogCreator() {
+ShellJavaScriptDialogManager::ShellJavaScriptDialogManager() {
 }
 
-ShellJavaScriptDialogCreator::~ShellJavaScriptDialogCreator() {
+ShellJavaScriptDialogManager::~ShellJavaScriptDialogManager() {
 }
 
-void ShellJavaScriptDialogCreator::RunJavaScriptDialog(
+void ShellJavaScriptDialogManager::RunJavaScriptDialog(
     WebContents* web_contents,
     const GURL& origin_url,
     const std::string& accept_lang,
@@ -71,7 +71,7 @@ void ShellJavaScriptDialogCreator::RunJavaScriptDialog(
 #endif
 }
 
-void ShellJavaScriptDialogCreator::RunBeforeUnloadDialog(
+void ShellJavaScriptDialogManager::RunBeforeUnloadDialog(
     WebContents* web_contents,
     const string16& message_text,
     bool is_reload,
@@ -118,7 +118,7 @@ void ShellJavaScriptDialogCreator::RunBeforeUnloadDialog(
 #endif
 }
 
-void ShellJavaScriptDialogCreator::ResetJavaScriptState(
+void ShellJavaScriptDialogManager::ResetJavaScriptState(
     WebContents* web_contents) {
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
   if (dialog_.get()) {
@@ -130,7 +130,7 @@ void ShellJavaScriptDialogCreator::ResetJavaScriptState(
 #endif
 }
 
-void ShellJavaScriptDialogCreator::DialogClosed(ShellJavaScriptDialog* dialog) {
+void ShellJavaScriptDialogManager::DialogClosed(ShellJavaScriptDialog* dialog) {
 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(TOOLKIT_GTK)
   DCHECK_EQ(dialog, dialog_.get());
   dialog_.reset();
diff --git a/content/shell/shell_javascript_dialog_creator.h b/content/shell/shell_javascript_dialog_manager.h
index 55fd548..8ec82be 100644
--- a/content/shell/shell_javascript_dialog_creator.h
+++ b/content/shell/shell_javascript_dialog_manager.h
@@ -2,24 +2,24 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_CREATOR_H_
-#define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_CREATOR_H_
+#ifndef CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
+#define CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
 
-#include "base/compiler_specific.h"
 #include "base/callback_forward.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/public/browser/javascript_dialogs.h"
+#include "content/public/browser/javascript_dialog_manager.h"
 
 namespace content {
 
 class ShellJavaScriptDialog;
 
-class ShellJavaScriptDialogCreator : public JavaScriptDialogCreator {
+class ShellJavaScriptDialogManager : public JavaScriptDialogManager {
  public:
-  ShellJavaScriptDialogCreator();
-  virtual ~ShellJavaScriptDialogCreator();
+  ShellJavaScriptDialogManager();
+  virtual ~ShellJavaScriptDialogManager();
 
-  // JavaScriptDialogCreator:
+  // JavaScriptDialogManager:
   virtual void RunJavaScriptDialog(
       WebContents* web_contents,
       const GURL& origin_url,
@@ -56,9 +56,9 @@ class ShellJavaScriptDialogCreator : public JavaScriptDialogCreator {
 
   base::Closure dialog_request_callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogCreator);
+  DISALLOW_COPY_AND_ASSIGN(ShellJavaScriptDialogManager);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_CREATOR_H_
+#endif  // CONTENT_SHELL_SHELL_JAVASCRIPT_DIALOG_MANAGER_H_
diff --git a/content/shell/shell_javascript_dialog_win.cc b/content/shell/shell_javascript_dialog_win.cc
index 93c78da..08ca91c 100644
--- a/content/shell/shell_javascript_dialog_win.cc
+++ b/content/shell/shell_javascript_dialog_win.cc
@@ -7,7 +7,7 @@
 #include "base/string_util.h"
 #include "content/shell/resource.h"
 #include "content/shell/shell.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
 
 namespace content {
 
@@ -35,7 +35,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog,
       if (owner->dialog_win_) {
         owner->dialog_win_ = 0;
         owner->callback_.Run(false, string16());
-        owner->creator_->DialogClosed(owner);
+        owner->manager_->DialogClosed(owner);
       }
       break;
     }
@@ -65,7 +65,7 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog,
         owner->dialog_win_ = 0;
         owner->callback_.Run(result, user_input);
         DestroyWindow(dialog);
-        owner->creator_->DialogClosed(owner);
+        owner->manager_->DialogClosed(owner);
       }
       break;
     }
@@ -76,13 +76,13 @@ INT_PTR CALLBACK ShellJavaScriptDialog::DialogProc(HWND dialog,
 }
 
 ShellJavaScriptDialog::ShellJavaScriptDialog(
-    ShellJavaScriptDialogCreator* creator,
+    ShellJavaScriptDialogManager* manager,
     gfx::NativeWindow parent_window,
     JavaScriptMessageType message_type,
     const string16& message_text,
     const string16& default_prompt_text,
-    const JavaScriptDialogCreator::DialogClosedCallback& callback)
-    : creator_(creator),
+    const JavaScriptDialogManager::DialogClosedCallback& callback)
+    : manager_(manager),
       callback_(callback),
       message_text_(message_text),
       default_prompt_text_(default_prompt_text),
diff --git a/content/test/content_browser_test_utils.cc b/content/test/content_browser_test_utils.cc
index 1e92c7f..b8c64c3 100644
--- a/content/test/content_browser_test_utils.cc
+++ b/content/test/content_browser_test_utils.cc
@@ -16,7 +16,7 @@
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/shell.h"
-#include "content/shell/shell_javascript_dialog_creator.h"
+#include "content/shell/shell_javascript_dialog_manager.h"
 #include "net/base/net_util.h"
 
 namespace content {
@@ -55,12 +55,12 @@ void NavigateToURL(Shell* window, const GURL& url) {
 }
 
 void WaitForAppModalDialog(Shell* window) {
-  ShellJavaScriptDialogCreator* dialog_creator =
-      static_cast<ShellJavaScriptDialogCreator*>(
-          window->GetJavaScriptDialogCreator());
+  ShellJavaScriptDialogManager* dialog_manager=
+      static_cast<ShellJavaScriptDialogManager*>(
+          window->GetJavaScriptDialogManager());
 
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner();
-  dialog_creator->set_dialog_request_callback(runner->QuitClosure());
+  dialog_manager->set_dialog_request_callback(runner->QuitClosure());
   runner->Run();
 }