| 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/browser/ui/webui/options/options_ui_browsertest.h" | 5 #include "chrome/browser/ui/webui/options/options_ui_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/browser/ui/browser_tabstrip.h" | 10 #include "chrome/browser/ui/browser_tabstrip.h" |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 EXPECT_EQ(true, navbar_exist); | 35 EXPECT_EQ(true, navbar_exist); |
| 36 } | 36 } |
| 37 | 37 |
| 38 void OptionsBrowserTest::VerifyTitle() { | 38 void OptionsBrowserTest::VerifyTitle() { |
| 39 string16 title = chrome::GetActiveWebContents(browser())->GetTitle(); | 39 string16 title = chrome::GetActiveWebContents(browser())->GetTitle(); |
| 40 string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE); | 40 string16 expected_title = l10n_util::GetStringUTF16(IDS_SETTINGS_TITLE); |
| 41 EXPECT_NE(title.find(expected_title), string16::npos); | 41 EXPECT_NE(title.find(expected_title), string16::npos); |
| 42 } | 42 } |
| 43 | 43 |
| 44 // Flaky, see http://crbug.com/119671. | 44 // Flaky, see http://crbug.com/119671. |
| 45 IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, FLAKY_LoadOptionsByURL) { | 45 IN_PROC_BROWSER_TEST_F(OptionsBrowserTest, DISABLED_LoadOptionsByURL) { |
| 46 NavigateToSettings(); | 46 NavigateToSettings(); |
| 47 VerifyTitle(); | 47 VerifyTitle(); |
| 48 VerifyNavbar(); | 48 VerifyNavbar(); |
| 49 } | 49 } |
| 50 | 50 |
| 51 } // namespace options | 51 } // namespace options |
| OLD | NEW |