Consolidate javascript_dialog_manager.h and javascript_dialog_manager_impl.h

chrome/browser/lifetime/browser_close_manager_browsertest.cc

 // Copyright 2013 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 <vector>
 
 #include "base/command_line.h"
 #include "base/files/scoped_temp_dir.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 31 matching lines @@
 #include "content/test/net/url_request_slow_download_job.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/url_request/url_request_mock_http_job.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 namespace {
 
-NativeAppModalDialog* GetNextDialog() {
-  AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog();
+app_modal::NativeAppModalDialog* GetNextDialog() {
+  app_modal::AppModalDialog* dialog = ui_test_utils::WaitForAppModalDialog();
   EXPECT_TRUE(dialog->IsJavaScriptModalDialog());
-  JavaScriptAppModalDialog* js_dialog =
-      static_cast<JavaScriptAppModalDialog*>(dialog);
+  app_modal::JavaScriptAppModalDialog* js_dialog =
+      static_cast<app_modal::JavaScriptAppModalDialog*>(dialog);
   CHECK(js_dialog->native_dialog());
   return js_dialog->native_dialog();
 }
 
 void AcceptClose() {
   GetNextDialog()->AcceptAppModalDialog();
 }
 
 void CancelClose() {
   GetNextDialog()->CancelAppModalDialog();
@@ skipping 879 matching lines @@
 
   chrome::CloseAllBrowsers();
   EXPECT_FALSE(browser_shutdown::IsTryingToQuit());
   EXPECT_TRUE(chrome::BrowserIterator().done());
   EXPECT_TRUE(IsBackgroundModeSuspended());
 }
 
 INSTANTIATE_TEST_CASE_P(BrowserCloseManagerWithBackgroundModeBrowserTest,
                         BrowserCloseManagerWithBackgroundModeBrowserTest,
                         testing::Bool());