Reenable tests which were disabled while we investigated flakiness on Windows trybots.

The cause had been reverted.

BUG=517488,334372,517018,517029,517307,517309,517484
TBR=vabr@chromium.org

Review URL: https://codereview.chromium.org/1284143004

Cr-Commit-Position: refs/heads/master@{#343270}

6 files changed, 9 insertions, 89 deletions

diff --git a/chrome/test/data/webui/history_browsertest.js b/chrome/test/data/webui/history_browsertest.js
index d69ab49..9e1b26a 100644
--- a/chrome/test/data/webui/history_browsertest.js
+++ b/chrome/test/data/webui/history_browsertest.js
@@ -822,8 +822,7 @@ TEST_F('HistoryWebUIRealBackendTest',
 /**
  * Test individual deletion of history entries.
  */
-// Flakes on Win. http://crbug.com/334372#c3
-TEST_F('HistoryWebUIRealBackendTest', 'DISABLED_singleDeletion', function() {
+TEST_F('HistoryWebUIRealBackendTest', 'singleDeletion', function() {
   // Deletes the history entry represented by |entryElement|, and calls callback
   // when the deletion is complete.
   var removeEntry = function(entryElement, callback) {
diff --git a/chrome/test/data/webui/net_internals/bandwidth_view.js b/chrome/test/data/webui/net_internals/bandwidth_view.js
index 2bf8491..38ceafb 100644
--- a/chrome/test/data/webui/net_internals/bandwidth_view.js
+++ b/chrome/test/data/webui/net_internals/bandwidth_view.js
@@ -239,20 +239,10 @@ DataReductionProxyTask.prototype = {
   }
 };
 
-// Flaky on Win Debug build - crbug.com/517484
-GEN('#if defined(OS_WIN)');
-GEN('# define MAYBE_netInternalsSessionBandwidthSucceed \\');
-GEN('     DISABLED_netInternalsSessionBandwidthSucceed');
-GEN('#else');
-GEN('# define MAYBE_netInternalsSessionBandwidthSucceed \\');
-GEN('     netInternalsSessionBandwidthSucceed');
-GEN('#endif');
-
 /**
  * Loads a page and checks bandwidth statistics.
  */
-TEST_F('NetInternalsTest',
-       'MAYBE_netInternalsSessionBandwidthSucceed', function() {
+TEST_F('NetInternalsTest', 'netInternalsSessionBandwidthSucceed', function() {
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(
       new NetInternalsTest.GetTestServerURLTask('files/title1.html'));
diff --git a/chrome/test/data/webui/net_internals/dns_view.js b/chrome/test/data/webui/net_internals/dns_view.js
index c4f0376..a2bab3f 100644
--- a/chrome/test/data/webui/net_internals/dns_view.js
+++ b/chrome/test/data/webui/net_internals/dns_view.js
@@ -259,22 +259,12 @@ TEST_F('NetInternalsTest', 'netInternalsDnsViewAddTwoTwice', function() {
   taskQueue.run(true);
 });
 
-// Flaky on Win Debug build - crbug.com/517484
-GEN('#if defined(OS_WIN)');
-GEN('# define MAYBE_netInternalsDnsViewIncognitoClears \\');
-GEN('     DISABLED_netInternalsDnsViewIncognitoClears');
-GEN('#else');
-GEN('# define MAYBE_netInternalsDnsViewIncognitoClears \\');
-GEN('     netInternalsDnsViewIncognitoClears');
-GEN('#endif');
-
 /**
  * Makes sure that openning and then closing an incognito window clears the
  * DNS cache.  To keep things simple, we add a fake cache entry ourselves,
  * rather than having the incognito browser create one.
  */
-TEST_F('NetInternalsTest',
-       'MAYBE_netInternalsDnsViewIncognitoClears', function() {
+TEST_F('NetInternalsTest', 'netInternalsDnsViewIncognitoClears', function() {
   NetInternalsTest.switchToView('dns');
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(new NetInternalsTest.CreateIncognitoBrowserTask());
diff --git a/chrome/test/data/webui/net_internals/log_util.js b/chrome/test/data/webui/net_internals/log_util.js
index 3a5b616..b167b81 100644
--- a/chrome/test/data/webui/net_internals/log_util.js
+++ b/chrome/test/data/webui/net_internals/log_util.js
@@ -258,21 +258,11 @@ TEST_F('NetInternalsTest',
   taskQueue.run(true);
 });
 
-// Flaky on Win Debug build - crbug.com/517484
-GEN('#if defined(OS_WIN)');
-GEN('# define MAYBE_netInternalsLogUtilImportNetLogFileTruncated \\');
-GEN('     DISABLED_netInternalsLogUtilImportNetLogFileTruncated');
-GEN('#else');
-GEN('# define MAYBE_netInternalsLogUtilImportNetLogFileTruncated \\');
-GEN('     netInternalsLogUtilImportNetLogFileTruncated');
-GEN('#endif');
-
 /**
  * Same as above, but it truncates the log to simulate the case of a crash when
  * creating a log.
  */
-TEST_F('NetInternalsTest',
-    'MAYBE_netInternalsLogUtilImportNetLogFileTruncated',
+TEST_F('NetInternalsTest', 'netInternalsLogUtilImportNetLogFileTruncated',
     function() {
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(new GetNetLogFileContentsAndLoadLogTask(20));
diff --git a/chrome/test/data/webui/net_internals/prerender_view.js b/chrome/test/data/webui/net_internals/prerender_view.js
index 559eb1d..b48f709 100644
--- a/chrome/test/data/webui/net_internals/prerender_view.js
+++ b/chrome/test/data/webui/net_internals/prerender_view.js
@@ -181,20 +181,10 @@ PrerenderTask.prototype = {
   }
 };
 
-// Flaky on Win Debug build - crbug.com/517484
-GEN('#if defined(OS_WIN)');
-GEN('# define MAYBE_netInternalsPrerenderViewSucceed \\');
-GEN('     DISABLED_netInternalsPrerenderViewSucceed');
-GEN('#else');
-GEN('# define MAYBE_netInternalsPrerenderViewSucceed \\');
-GEN('     netInternalsPrerenderViewSucceed');
-GEN('#endif');
-
 /**
  * Prerender a page and navigate to it, once prerendering starts.
  */
-TEST_F('NetInternalsTest',
-       'MAYBE_netInternalsPrerenderViewSucceed', function() {
+TEST_F('NetInternalsTest', 'netInternalsPrerenderViewSucceed', function() {
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(
       new NetInternalsTest.GetTestServerURLTask('files/title1.html'));
@@ -202,19 +192,10 @@ TEST_F('NetInternalsTest',
   taskQueue.run();
 });
 
-// Flaky on Win Debug build - crbug.com/517484
-GEN('#if defined(OS_WIN)');
-GEN('# define MAYBE_netInternalsPrerenderViewFail \\');
-GEN('     DISABLED_netInternalsPrerenderViewFail');
-GEN('#else');
-GEN('# define MAYBE_netInternalsPrerenderViewFail \\');
-GEN('     netInternalsPrerenderViewFail');
-GEN('#endif');
-
 /**
  * Prerender a page that is expected to fail.
  */
-TEST_F('NetInternalsTest', 'MAYBE_netInternalsPrerenderViewFail', function() {
+TEST_F('NetInternalsTest', 'netInternalsPrerenderViewFail', function() {
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(
       new NetInternalsTest.GetTestServerURLTask('files/download-test1.lib'));
diff --git a/chrome/test/data/webui/net_internals/sdch_view.js b/chrome/test/data/webui/net_internals/sdch_view.js
index f3030d8..f1878ac 100644
--- a/chrome/test/data/webui/net_internals/sdch_view.js
+++ b/chrome/test/data/webui/net_internals/sdch_view.js
@@ -174,21 +174,11 @@ LoadPageWithDecodeErrorTask.prototype = {
   }
 };
 
-// Flaky on Win Debug build - crbug.com/517484
-GEN('#if defined(OS_WIN)');
-GEN('# define MAYBE_netInternalsSdchViewFetchDictionary \\');
-GEN('     DISABLED_netInternalsSdchViewFetchDictionary');
-GEN('#else');
-GEN('# define MAYBE_netInternalsSdchViewFetchDictionary \\');
-GEN('     netInternalsSdchViewFetchDictionary');
-GEN('#endif');
-
 /**
  * Load a page, which results in downloading a SDCH dictionary. Make sure its
  * data is displayed.
  */
-TEST_F('NetInternalsTest',
-       'MAYBE_netInternalsSdchViewFetchDictionary', function() {
+TEST_F('NetInternalsTest', 'netInternalsSdchViewFetchDictionary', function() {
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(
       new NetInternalsTest.GetTestServerURLTask(
@@ -197,21 +187,11 @@ TEST_F('NetInternalsTest',
   taskQueue.run();
 });
 
-// Flaky on Win Debug build - crbug.com/517484
-GEN('#if defined(OS_WIN)');
-GEN('# define MAYBE_netInternalsSdchViewBlacklistMeta \\');
-GEN('     DISABLED_netInternalsSdchViewBlacklistMeta');
-GEN('#else');
-GEN('# define MAYBE_netInternalsSdchViewBlacklistMeta \\');
-GEN('     netInternalsSdchViewBlacklistMeta');
-GEN('#endif');
-
 /**
  * Load a page, get the dictionary for it, and get decoding error to see
  * the blacklist in action.
  */
-TEST_F('NetInternalsTest',
-       'MAYBE_netInternalsSdchViewBlacklistMeta', function() {
+TEST_F('NetInternalsTest', 'netInternalsSdchViewBlacklistMeta', function() {
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(
       new NetInternalsTest.GetTestServerURLTask(
@@ -225,20 +205,10 @@ TEST_F('NetInternalsTest',
   taskQueue.run();
 });
 
-// Flaky on Win Debug build - crbug.com/517484
-GEN('#if defined(OS_WIN)');
-GEN('# define MAYBE_netInternalsSdchViewBlacklistNonSdch \\');
-GEN('     DISABLED_netInternalsSdchViewBlacklistNonSdch');
-GEN('#else');
-GEN('# define MAYBE_netInternalsSdchViewBlacklistNonSdch \\');
-GEN('     netInternalsSdchViewBlacklistNonSdch');
-GEN('#endif');
-
 /**
  * Load a page, which is said to be SDCH-encoded, though we don't expect it.
  */
-TEST_F('NetInternalsTest',
-       'MAYBE_netInternalsSdchViewBlacklistNonSdch', function() {
+TEST_F('NetInternalsTest', 'netInternalsSdchViewBlacklistNonSdch', function() {
   var taskQueue = new NetInternalsTest.TaskQueue(true);
   taskQueue.addTask(
       new NetInternalsTest.GetTestServerURLTask(