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 "chrome/test/ui/ui_test.h" | 5 #include "chrome/test/ui/ui_test.h" |
6 | 6 |
7 #include "base/utf_string_conversions.h" | 7 #include "base/utf_string_conversions.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
11 #include "chrome/browser/ui/web_contents_modal_dialog_manager.h" | |
12 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" | 11 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" |
13 #include "chrome/common/url_constants.h" | 12 #include "chrome/common/url_constants.h" |
14 #include "chrome/test/base/in_process_browser_test.h" | 13 #include "chrome/test/base/in_process_browser_test.h" |
15 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 15 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
16 #include "content/public/browser/web_contents.h" | 16 #include "content/public/browser/web_contents.h" |
17 #include "content/public/browser/web_contents_observer.h" | 17 #include "content/public/browser/web_contents_observer.h" |
18 #include "ui/web_dialogs/test/test_web_dialog_delegate.h" | 18 #include "ui/web_dialogs/test/test_web_dialog_delegate.h" |
19 | 19 |
20 using content::WebContents; | 20 using content::WebContents; |
21 using ui::WebDialogDelegate; | 21 using ui::WebDialogDelegate; |
| 22 using web_modal::WebContentsModalDialogManager; |
22 | 23 |
23 namespace { | 24 namespace { |
24 | 25 |
25 class ConstrainedWebDialogBrowserTestObserver | 26 class ConstrainedWebDialogBrowserTestObserver |
26 : public content::WebContentsObserver { | 27 : public content::WebContentsObserver { |
27 public: | 28 public: |
28 explicit ConstrainedWebDialogBrowserTestObserver(WebContents* contents) | 29 explicit ConstrainedWebDialogBrowserTestObserver(WebContents* contents) |
29 : content::WebContentsObserver(contents), | 30 : content::WebContentsObserver(contents), |
30 contents_destroyed_(false) { | 31 contents_destroyed_(false) { |
31 } | 32 } |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 | 97 |
97 ConstrainedWebDialogBrowserTestObserver observer(new_tab.get()); | 98 ConstrainedWebDialogBrowserTestObserver observer(new_tab.get()); |
98 dialog_delegate->ReleaseWebContentsOnDialogClose(); | 99 dialog_delegate->ReleaseWebContentsOnDialogClose(); |
99 dialog_delegate->OnDialogCloseFromWebUI(); | 100 dialog_delegate->OnDialogCloseFromWebUI(); |
100 | 101 |
101 ASSERT_FALSE(observer.contents_destroyed()); | 102 ASSERT_FALSE(observer.contents_destroyed()); |
102 EXPECT_FALSE(IsShowingWebContentsModalDialog(web_contents)); | 103 EXPECT_FALSE(IsShowingWebContentsModalDialog(web_contents)); |
103 new_tab.reset(); | 104 new_tab.reset(); |
104 EXPECT_TRUE(observer.contents_destroyed()); | 105 EXPECT_TRUE(observer.contents_destroyed()); |
105 } | 106 } |
OLD | NEW |