[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

1 files changed, 2 insertions, 3 deletions

diff --git a/chrome/browser/browser_init_browsertest.cc b/chrome/browser/browser_init_browsertest.cc
index 94aa2f2..1ee9e50 100644
--- a/chrome/browser/browser_init_browsertest.cc
+++ b/chrome/browser/browser_init_browsertest.cc
@@ -58,10 +58,10 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, OpenURLsPopup) {
 
 // Test that we prevent openning potentially dangerous schemes from the
 // command line.
-// jschuh: DISABLED because the process doesn't have sufficient time
+// TODO(jschuh): FLAKY because the process doesn't have sufficient time
 // to start on most BuildBot runs and I don't want to add longer delays to
 // the test. I'll circle back and make this work properly when i get a chance.
-IN_PROC_BROWSER_TEST_F(BrowserInitTest, DISABLED_BlockBadURLs) {
+IN_PROC_BROWSER_TEST_F(BrowserInitTest, FLAKY_BlockBadURLs) {
   const std::wstring testurlstr(L"http://localhost/");
   const GURL testurl(WideToUTF16Hack(testurlstr));
   CommandLine cmdline(CommandLine::ARGUMENTS_ONLY);
@@ -85,5 +85,4 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, DISABLED_BlockBadURLs) {
   ASSERT_EQ(browser()->tab_count(), 3);
 }
 
-
 }  // namespace