| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
| 6 #include "chrome/browser/profiles/profile.h" | 6 #include "chrome/browser/profiles/profile.h" |
| 7 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 9 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" | 9 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" |
| 10 #include "chrome/common/url_constants.h" | 10 #include "chrome/common/url_constants.h" |
| 11 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
| 12 #include "chrome/test/base/ui_test_utils.h" | |
| 13 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 12 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 14 #include "content/public/browser/web_contents.h" | 13 #include "content/public/browser/web_contents.h" |
| 15 #include "content/public/browser/web_contents_observer.h" | 14 #include "content/public/browser/web_contents_observer.h" |
| 16 #include "ui/web_dialogs/test/test_web_dialog_delegate.h" | 15 #include "ui/web_dialogs/test/test_web_dialog_delegate.h" |
| 17 | 16 |
| 18 using content::WebContents; | 17 using content::WebContents; |
| 19 using ui::WebDialogDelegate; | 18 using ui::WebDialogDelegate; |
| 20 using web_modal::WebContentsModalDialogManager; | 19 using web_modal::WebContentsModalDialogManager; |
| 21 | 20 |
| 22 namespace { | 21 namespace { |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 | 86 |
| 88 ConstrainedWebDialogBrowserTestObserver observer(new_tab.get()); | 87 ConstrainedWebDialogBrowserTestObserver observer(new_tab.get()); |
| 89 dialog_delegate->ReleaseWebContentsOnDialogClose(); | 88 dialog_delegate->ReleaseWebContentsOnDialogClose(); |
| 90 dialog_delegate->OnDialogCloseFromWebUI(); | 89 dialog_delegate->OnDialogCloseFromWebUI(); |
| 91 | 90 |
| 92 ASSERT_FALSE(observer.contents_destroyed()); | 91 ASSERT_FALSE(observer.contents_destroyed()); |
| 93 EXPECT_FALSE(IsShowingWebContentsModalDialog(web_contents)); | 92 EXPECT_FALSE(IsShowingWebContentsModalDialog(web_contents)); |
| 94 new_tab.reset(); | 93 new_tab.reset(); |
| 95 EXPECT_TRUE(observer.contents_destroyed()); | 94 EXPECT_TRUE(observer.contents_destroyed()); |
| 96 } | 95 } |
| OLD | NEW |