Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/test/base/ui_test_utils.h

 // 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_TEST_BASE_UI_TEST_UTILS_H_
 #define CHROME_TEST_BASE_UI_TEST_UTILS_H_
 
 #include <map>
 #include <queue>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/history/history_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #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;
 }
 
 namespace chrome {
 struct NavigateParams;
 }
 
 namespace content {
 class MessageLoopRunner;
@@ skipping 74 matching lines @@
 // Generate the URL for testing a particular test.
 // HTML for the tests is all located in
 // test_root_directory/dir/<file>
 // The returned path is GURL format.
 GURL GetTestUrl(const base::FilePath& dir, const base::FilePath& file);
 
 // Generate the path of the build directory, relative to the source root.
 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
 // of the current match. |selection_rect| is an optional parameter which is set
 // to the location of the current match.
 int FindInPage(content::WebContents* tab,
                const base::string16& search_string,
                bool forward,
                bool case_sensitive,
                int* ordinal,
@@ skipping 149 matching lines @@
   std::vector<GURL> urls_;
 
   base::CancelableTaskTracker tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryEnumerator);
 };
 
 }  // namespace ui_test_utils
 
 #endif  // CHROME_TEST_BASE_UI_TEST_UTILS_H_