diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 06:41:43 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-08 06:41:43 +0000 |
| commit | 93b86a850b7b1b3f46a7c4fc4521fefa8ca56e8d (patch) | |
| tree | 379ae4e770b1a30e925852ee51e58250a4c7d3fd /chrome/browser/browser_browsertest.cc | |
| parent | f039cd1a367ad89d07a2344b6a8e3f39cd5b0758 (diff) | |
| download | chromium_src-93b86a850b7b1b3f46a7c4fc4521fefa8ca56e8d.zip chromium_src-93b86a850b7b1b3f46a7c4fc4521fefa8ca56e8d.tar.gz chromium_src-93b86a850b7b1b3f46a7c4fc4521fefa8ca56e8d.tar.bz2 | |
[GTTF] Clean up browser tests:
- use more ui_test_utils functions to simplify the code
- expose more consistent and powerful utilities in ui_test_utils
- minor style improvements
- move some tests from DISABLED to FLAKY so we don't lose coverage
- remove redundant timeouts
- check more return values
TEST=browser_tests
BUG=none
Review URL: http://codereview.chromium.org/1571002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_browsertest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 66922f5..ee51d90 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -364,7 +364,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcut) { ui_test_utils::NavigateToURL(browser(), blank_url); EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); } -#endif +#endif // !defined(OS_MACOSX) // Test RenderView correctly send back favicon url for web page that redirects // to an anchor in javascript body.onload handler. @@ -452,8 +452,7 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, AppTabRemovedWhenExtensionUninstalled) { // The uninstall should have removed the tab. ASSERT_EQ(1, browser()->tab_count()); } - -#endif +#endif // !defined(OS_MACOSX) // Tests that the CLD (Compact Language Detection) works properly. IN_PROC_BROWSER_TEST_F(BrowserTest, PageLanguageDetection) { @@ -551,4 +550,4 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RestorePinnedTabs) { EXPECT_TRUE(new_model->GetTabContentsAt(0)->app_extension() == app_extension); } -#endif +#endif // !defined(OS_CHROMEOS) |