Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/test/base/ui_test_utils.h

Index: chrome/test/base/ui_test_utils.h
diff --git a/chrome/test/base/ui_test_utils.h b/chrome/test/base/ui_test_utils.h
index 81fa90400464f8bb4f7412a17367df9255e17bfe..7f11fb243009076548b3194382c045dd8d18567d 100644
--- a/chrome/test/base/ui_test_utils.h
+++ b/chrome/test/base/ui_test_utils.h
@@ -26,13 +26,16 @@
 #include "ui/gfx/native_widget_types.h"
 #include "url/gurl.h"
 
-class AppModalDialog;
 class Browser;
 class LocationBar;
 class Profile;
 class SkBitmap;
 class TemplateURLService;
 
+namespace app_modal {
+class AppModalDialog;
+}
+
 namespace base {
 class FilePath;
 }
@@ -127,7 +130,7 @@ GURL GetTestUrl(const base::FilePath& dir, const base::FilePath& file);
 bool GetRelativeBuildDirectory(base::FilePath* build_dir);
 
 // Blocks until an application modal dialog is showns and returns it.
-AppModalDialog* WaitForAppModalDialog();
+app_modal::AppModalDialog* WaitForAppModalDialog();
 
 // Performs a find in the page of the specified tab. Returns the number of
 // matches found.  |ordinal| is an optional parameter which is set to the index