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

Side by Side Diff: chrome/browser/ui/webui/options2/options_ui2_browsertest.cc

Issue 10332175: Mark OptionsBorwserTest.LoadOptionsByURL flaky on all platforms. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 7 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 | « 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 "chrome/browser/ui/webui/options2/options_ui2_browsertest.h" 5 #include "chrome/browser/ui/webui/options2/options_ui2_browsertest.h"
6 6
7 #include "base/string16.h" 7 #include "base/string16.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/common/url_constants.h" 10 #include "chrome/common/url_constants.h"
(...skipping 22 matching lines...) Expand all
33 L"!!document.getElementById('navigation'))", &navbar_exist)); 33 L"!!document.getElementById('navigation'))", &navbar_exist));
34 EXPECT_EQ(true, navbar_exist); 34 EXPECT_EQ(true, navbar_exist);
35 } 35 }
36 36
37 void OptionsBrowserTest::VerifyTitle() { 37 void OptionsBrowserTest::VerifyTitle() {
38 string16 title = browser()->GetSelectedWebContents()->GetTitle(); 38 string16 title = browser()->GetSelectedWebContents()->GetTitle();
39 string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE); 39 string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE);
40 EXPECT_NE(title.find(expected_title), string16::npos); 40 EXPECT_NE(title.find(expected_title), string16::npos);
41 } 41 }
42 42
43 // Observed flaky on Win and Mac, see http://crbug.com/119671. 43 // Flaky, see http://crbug.com/119671.
44 #if defined(OS_WIN) || defined(OS_MACOSX) 44 IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, FLAKY_LoadOptionsByURL) {
45 #define MAYBE_LoadOptionsByURL FLAKY_LoadOptionsByURL
46 #else
47 #define MAYBE_LoadOptionsByURL LoadOptionsByURL
48 #endif
49
50 IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, MAYBE_LoadOptionsByURL) {
51 NavigateToSettings(); 45 NavigateToSettings();
52 VerifyTitle(); 46 VerifyTitle();
53 VerifyNavbar(); 47 VerifyNavbar();
54 } 48 }
55 49
56 } // namespace options2 50 } // namespace options2
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