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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
777 // the pending RVH to be destroyed. | 777 // the pending RVH to be destroyed. |
778 host_destroyed_observer.Wait(); | 778 host_destroyed_observer.Wait(); |
779 EXPECT_EQ(url, browser()->toolbar_model()->GetURL()); | 779 EXPECT_EQ(url, browser()->toolbar_model()->GetURL()); |
780 | 780 |
781 // Clear the beforeunload handler so the test can easily exit. | 781 // Clear the beforeunload handler so the test can easily exit. |
782 browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame()-> | 782 browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame()-> |
783 ExecuteJavaScript(ASCIIToUTF16("onbeforeunload=null;")); | 783 ExecuteJavaScript(ASCIIToUTF16("onbeforeunload=null;")); |
784 } | 784 } |
785 | 785 |
786 // Crashy on mac. http://crbug.com/38522 Crashy on win too (after 3 years). | 786 // Crashy on mac. http://crbug.com/38522 Crashy on win too (after 3 years). |
787 #if defined(OS_MACOSX) || defined(OS_WIN) | 787 // Flaky timeouts on a MemorySanitizer bot. http://crbug.com/410891 |
| 788 #if defined(OS_MACOSX) || defined(OS_WIN) || defined(MEMORY_SANITIZER) |
788 #define MAYBE_SingleBeforeUnloadAfterWindowClose \ | 789 #define MAYBE_SingleBeforeUnloadAfterWindowClose \ |
789 DISABLED_SingleBeforeUnloadAfterWindowClose | 790 DISABLED_SingleBeforeUnloadAfterWindowClose |
790 #else | 791 #else |
791 #define MAYBE_SingleBeforeUnloadAfterWindowClose \ | 792 #define MAYBE_SingleBeforeUnloadAfterWindowClose \ |
792 SingleBeforeUnloadAfterWindowClose | 793 SingleBeforeUnloadAfterWindowClose |
793 #endif | 794 #endif |
794 | 795 |
795 // Test for crbug.com/11647. A page closed with window.close() should not have | 796 // Test for crbug.com/11647. A page closed with window.close() should not have |
796 // two beforeunload dialogs shown. | 797 // two beforeunload dialogs shown. |
797 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) { | 798 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_SingleBeforeUnloadAfterWindowClose) { |
(...skipping 1919 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2717 #endif | 2718 #endif |
2718 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); | 2719 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); |
2719 EXPECT_EQ(exp_commit_size, wcv_commit_size2); | 2720 EXPECT_EQ(exp_commit_size, wcv_commit_size2); |
2720 gfx::Size exp_final_size(initial_wcv_size); | 2721 gfx::Size exp_final_size(initial_wcv_size); |
2721 exp_final_size.Enlarge(wcv_resize_insets.width(), | 2722 exp_final_size.Enlarge(wcv_resize_insets.width(), |
2722 wcv_resize_insets.height() + height_inset); | 2723 wcv_resize_insets.height() + height_inset); |
2723 EXPECT_EQ(exp_final_size, | 2724 EXPECT_EQ(exp_final_size, |
2724 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); | 2725 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); |
2725 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); | 2726 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); |
2726 } | 2727 } |
OLD | NEW |