Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(488)

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 424143003: Disable BrowserTest.InterstitialCloseTab which is flaky. (Closed)
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 1961 matching lines...) Expand 10 before | Expand all | Expand 10 after
1972 loop_runner->QuitClosure()); 1972 loop_runner->QuitClosure());
1973 interstitial->DontProceed(); 1973 interstitial->DontProceed();
1974 loop_runner->Run(); 1974 loop_runner->Run();
1975 // interstitial is deleted now. 1975 // interstitial is deleted now.
1976 } 1976 }
1977 1977
1978 // Make sure input events still work in the renderer process. 1978 // Make sure input events still work in the renderer process.
1979 EXPECT_FALSE(contents->GetRenderProcessHost()->IgnoreInputEvents()); 1979 EXPECT_FALSE(contents->GetRenderProcessHost()->IgnoreInputEvents());
1980 } 1980 }
1981 1981
1982 1982 #if defined(OS_MACOSX)
1983 IN_PROC_BROWSER_TEST_F(BrowserTest, InterstitialCloseTab) { 1983 // http://crbug.com/393218
1984 #define MAYBE_InterstitialCloseTab DISABLED_InterstitialCloseTab
1985 #else
1986 #define MAYBE_InterstitialCloseTab InterstitialCloseTab
1987 #endif
1988 IN_PROC_BROWSER_TEST_F(BrowserTest, MAYBE_InterstitialCloseTab) {
1984 WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); 1989 WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents();
1985 1990
1986 { 1991 {
1987 scoped_refptr<content::MessageLoopRunner> loop_runner( 1992 scoped_refptr<content::MessageLoopRunner> loop_runner(
1988 new content::MessageLoopRunner); 1993 new content::MessageLoopRunner);
1989 1994
1990 InterstitialObserver observer(contents, 1995 InterstitialObserver observer(contents,
1991 loop_runner->QuitClosure(), 1996 loop_runner->QuitClosure(),
1992 base::Closure()); 1997 base::Closure());
1993 // Interstitial will delete itself when we close the tab. 1998 // Interstitial will delete itself when we close the tab.
(...skipping 721 matching lines...) Expand 10 before | Expand all | Expand 10 after
2715 #endif 2720 #endif
2716 EXPECT_EQ(exp_commit_size, rwhv_commit_size2); 2721 EXPECT_EQ(exp_commit_size, rwhv_commit_size2);
2717 EXPECT_EQ(exp_commit_size, wcv_commit_size2); 2722 EXPECT_EQ(exp_commit_size, wcv_commit_size2);
2718 gfx::Size exp_final_size(initial_wcv_size); 2723 gfx::Size exp_final_size(initial_wcv_size);
2719 exp_final_size.Enlarge(wcv_resize_insets.width(), 2724 exp_final_size.Enlarge(wcv_resize_insets.width(),
2720 wcv_resize_insets.height() + height_inset); 2725 wcv_resize_insets.height() + height_inset);
2721 EXPECT_EQ(exp_final_size, 2726 EXPECT_EQ(exp_final_size,
2722 web_contents->GetRenderWidgetHostView()->GetViewBounds().size()); 2727 web_contents->GetRenderWidgetHostView()->GetViewBounds().size());
2723 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size()); 2728 EXPECT_EQ(exp_final_size, web_contents->GetContainerBounds().size());
2724 } 2729 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698