Remove flaky from external extension uitest.

This was disabled when all ui tests were flaky due to NavigateToURL
issues. Also, due to the same underlying issue, it is possible that
this test had issues so I removed the parallism until the underlying
bug 57491 is fixed.

Also added a bug number to the other place where a hack was added to
work around bug 57491.

BUG=57405,57491
TEST=ui_tests --gtest_filter=TestIsSearchProviderInstalled

Review URL: http://codereview.chromium.org/3599019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61838 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 0 deletions

diff --git a/chrome/renderer/external_extension_uitest.cc b/chrome/renderer/external_extension_uitest.cc
index 9a48242..e391954 100644
--- a/chrome/renderer/external_extension_uitest.cc
+++ b/chrome/renderer/external_extension_uitest.cc
@@ -136,6 +136,7 @@ TEST_F(SearchProviderTest, FLAKY_TestIsSearchProviderInstalled) {
   for (size_t i = 0; i < arraysize(test_hosts); ++i) {
     test_data[i] = StartIsSearchProviderInstalledTest(
         browser, test_hosts[i], expected_results[i]);
+    FinishIsSearchProviderInstalledTest(test_data[i]);
   }
 
   // Start tests for incognito mode (and verify the result is 0).
@@ -145,10 +146,18 @@ TEST_F(SearchProviderTest, FLAKY_TestIsSearchProviderInstalled) {
   for (size_t i = 0; i < arraysize(test_hosts); ++i) {
     test_data[i + arraysize(test_hosts)] = StartIsSearchProviderInstalledTest(
         incognito, test_hosts[i], "0");
+    FinishIsSearchProviderInstalledTest(test_data[i + arraysize(test_hosts)]);
   }
 
+  // The following should be re-enabled. At the moment, there are problems with
+  // doing all of these queries in parallel -- see http://crbug.com/57491.
+#if 0
+  // Remove the calls to FinishIsSearchProviderInstalledTest above when
+  // re-enabling this code.
+
   // Do the verification.
   for (size_t i = 0; i < arraysize(test_data); ++i) {
     FinishIsSearchProviderInstalledTest(test_data[i]);
   }
+#endif
 }