Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/test/base/ui_test_utils.cc

 // 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.
 
 #include "chrome/test/base/ui_test_utils.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 89 matching lines @@
   Browser* new_browser = GetBrowserNotInSet(excluded_browsers);
   if (new_browser == NULL) {
     BrowserAddedObserver observer;
     new_browser = observer.WaitForSingleNewBrowser();
     // The new browser should never be in |excluded_browsers|.
     DCHECK(!ContainsKey(excluded_browsers, new_browser));
   }
   return new_browser;
 }
 
-class AppModalDialogWaiter : public AppModalDialogObserver {
+class AppModalDialogWaiter : public app_modal::AppModalDialogObserver {
  public:
   AppModalDialogWaiter()
       : dialog_(NULL) {
   }
   ~AppModalDialogWaiter() override {
   }
 
-  AppModalDialog* Wait() {
+  app_modal::AppModalDialog* Wait() {
     if (dialog_)
       return dialog_;
     message_loop_runner_ = new content::MessageLoopRunner;
     message_loop_runner_->Run();
     EXPECT_TRUE(dialog_);
     return dialog_;
   }
 
   // AppModalDialogWaiter:
-  void Notify(AppModalDialog* dialog) override {
+  void Notify(app_modal::AppModalDialog* dialog) override {
     DCHECK(!dialog_);
     dialog_ = dialog;
     if (message_loop_runner_.get() && message_loop_runner_->loop_running())
       message_loop_runner_->Quit();
   }
 
  private:
-  AppModalDialog* dialog_;
+  app_modal::AppModalDialog* dialog_;
   scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(AppModalDialogWaiter);
 };
 
 }  // namespace
 
 bool GetCurrentTabTitle(const Browser* browser, base::string16* title) {
   WebContents* web_contents =
       browser->tab_strip_model()->GetActiveWebContents();
@@ skipping 170 matching lines @@
 
   // Create a relative path.
   *build_dir = base::FilePath();
   for (size_t tmp_itr = match; tmp_itr < src_size; ++tmp_itr)
     *build_dir = build_dir->Append(FILE_PATH_LITERAL(".."));
   for (; match < exe_size; ++match)
     *build_dir = build_dir->Append(exe_parts[match]);
   return true;
 }
 
-AppModalDialog* WaitForAppModalDialog() {
-  AppModalDialogQueue* dialog_queue = AppModalDialogQueue::GetInstance();
+app_modal::AppModalDialog* WaitForAppModalDialog() {
+  app_modal::AppModalDialogQueue* dialog_queue =
+      app_modal::AppModalDialogQueue::GetInstance();
   if (dialog_queue->HasActiveDialog())
     return dialog_queue->active_dialog();
   AppModalDialogWaiter waiter;
   return waiter.Wait();
 }
 
 int FindInPage(WebContents* tab,
                const base::string16& search_string,
                bool forward,
                bool match_case,
@@ skipping 195 matching lines @@
 
 void HistoryEnumerator::HistoryQueryComplete(
     const base::Closure& quit_task,
     history::QueryResults* results) {
   for (size_t i = 0; i < results->size(); ++i)
     urls_.push_back((*results)[i].url());
   quit_task.Run();
 }
 
 }  // namespace ui_test_utils