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

Side by Side Diff: chrome/browser/popup_blocker_browsertest.cc

Issue 6366005: Mark two tests as flaky on ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Disable another test with the same crash stack Created 9 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/iframe_uitest.cc ('k') | 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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/message_loop.h" 9 #include "base/message_loop.h"
10 #include "chrome/browser/browser_list.h" 10 #include "chrome/browser/browser_list.h"
11 #include "chrome/browser/browser_window.h" 11 #include "chrome/browser/browser_window.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/tab_contents/tab_contents.h" 13 #include "chrome/browser/tab_contents/tab_contents.h"
14 #include "chrome/browser/ui/browser.h" 14 #include "chrome/browser/ui/browser.h"
15 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
16 #include "chrome/test/in_process_browser_test.h" 16 #include "chrome/test/in_process_browser_test.h"
17 #include "chrome/test/ui_test_utils.h" 17 #include "chrome/test/ui_test_utils.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 namespace { 20 namespace {
21 21
22 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker"); 22 static const FilePath::CharType* kTestDir = FILE_PATH_LITERAL("popup_blocker");
23 23
24 typedef InProcessBrowserTest PopupBlockerBrowserTest; 24 typedef InProcessBrowserTest PopupBlockerBrowserTest;
25 25
26 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, PopupBlockedPostBlank) { 26 #if defined(OS_CHROMEOS)
27 // Flakily crashes on ChromeOS: http://crbug.com/70192
28 #define MAYBE_PopupBlockedPostBlank DISABLED_PopupBlockedPostBlank
29 #else
30 #define MAYBE_PopupBlockedPostBlank PopupBlockedPostBlank
31 #endif
32 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, MAYBE_PopupBlockedPostBlank) {
27 FilePath file_name(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html")); 33 FilePath file_name(FILE_PATH_LITERAL("popup-blocked-to-post-blank.html"));
28 FilePath test_dir(kTestDir); 34 FilePath test_dir(kTestDir);
29 GURL url(ui_test_utils::GetTestUrl(test_dir, file_name)); 35 GURL url(ui_test_utils::GetTestUrl(test_dir, file_name));
30 ui_test_utils::NavigateToURL(browser(), url); 36 ui_test_utils::NavigateToURL(browser(), url);
31 37
32 // If the popup blocker blocked the blank post, there should be only one 38 // If the popup blocker blocked the blank post, there should be only one
33 // tab in only one browser window and the URL of current tab must be equal 39 // tab in only one browser window and the URL of current tab must be equal
34 // to the original URL. 40 // to the original URL.
35 EXPECT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile())); 41 EXPECT_EQ(1u, BrowserList::GetBrowserCount(browser()->profile()));
36 EXPECT_EQ(1, browser()->tab_count()); 42 EXPECT_EQ(1, browser()->tab_count());
37 TabContents* cur_tab = browser()->GetSelectedTabContents(); 43 TabContents* cur_tab = browser()->GetSelectedTabContents();
38 ASSERT_TRUE(cur_tab); 44 ASSERT_TRUE(cur_tab);
39 EXPECT_EQ(url, cur_tab->GetURL()); 45 EXPECT_EQ(url, cur_tab->GetURL());
40 } 46 }
41 47
42 } // namespace 48 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/iframe_uitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698