| 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" | |
| 6 | |
| 7 #include "base/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
| 8 #include "chrome/browser/profiles/profile.h" | 6 #include "chrome/browser/profiles/profile.h" |
| 9 #include "chrome/browser/ui/browser.h" | 7 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 8 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 11 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" | 9 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h" |
| 12 #include "chrome/common/url_constants.h" | 10 #include "chrome/common/url_constants.h" |
| 13 #include "chrome/test/base/in_process_browser_test.h" | 11 #include "chrome/test/base/in_process_browser_test.h" |
| 14 #include "chrome/test/base/ui_test_utils.h" | 12 #include "chrome/test/base/ui_test_utils.h" |
| 15 #include "components/web_modal/web_contents_modal_dialog_manager.h" | 13 #include "components/web_modal/web_contents_modal_dialog_manager.h" |
| 16 #include "content/public/browser/web_contents.h" | 14 #include "content/public/browser/web_contents.h" |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 | 95 |
| 98 ConstrainedWebDialogBrowserTestObserver observer(new_tab.get()); | 96 ConstrainedWebDialogBrowserTestObserver observer(new_tab.get()); |
| 99 dialog_delegate->ReleaseWebContentsOnDialogClose(); | 97 dialog_delegate->ReleaseWebContentsOnDialogClose(); |
| 100 dialog_delegate->OnDialogCloseFromWebUI(); | 98 dialog_delegate->OnDialogCloseFromWebUI(); |
| 101 | 99 |
| 102 ASSERT_FALSE(observer.contents_destroyed()); | 100 ASSERT_FALSE(observer.contents_destroyed()); |
| 103 EXPECT_FALSE(IsShowingWebContentsModalDialog(web_contents)); | 101 EXPECT_FALSE(IsShowingWebContentsModalDialog(web_contents)); |
| 104 new_tab.reset(); | 102 new_tab.reset(); |
| 105 EXPECT_TRUE(observer.contents_destroyed()); | 103 EXPECT_TRUE(observer.contents_destroyed()); |
| 106 } | 104 } |
| OLD | NEW |