Sync PRESUBMIT files with latest CQ changes

BUG=none
[email protected]

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263810 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 7c9408b..1fa3d1c 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -1337,6 +1337,8 @@
       ],
       'win': ['compile'],
       'win_chromium_compile_dbg': ['defaulttests'],
+      'win_chromium_dbg': ['defaulttests'],
+      'win_chromium_rel': ['defaulttests'],
       'win_nacl_sdk_build': ['compile'],
       'win_rel': standard_tests + [
           'app_list_unittests',
@@ -1429,7 +1431,7 @@
         'mac_chromium_rel',
     ])
   if all(re.search('(^|[/_])win[/_.]', f) for f in files):
-    return GetDefaultTryConfigs(['win', 'win_rel'])
+    return GetDefaultTryConfigs(['win_chromium_dbg', 'win_chromium_rel'])
   if all(re.search('(^|[/_])android[/_.]', f) for f in files):
     return GetDefaultTryConfigs([
         'android_aosp',
@@ -1450,7 +1452,7 @@
       'mac_chromium_compile_dbg',
       'mac_chromium_rel',
       'win_chromium_compile_dbg',
-      'win_rel',
+      'win_chromium_rel',
       'win_x64_rel',
   ]
 
diff --git a/chrome/browser/sync/PRESUBMIT.py b/chrome/browser/sync/PRESUBMIT.py
index 715bb60..a5b9f43 100644
--- a/chrome/browser/sync/PRESUBMIT.py
+++ b/chrome/browser/sync/PRESUBMIT.py
@@ -13,6 +13,6 @@
     'tryserver.chromium': {
       'linux_chromium_rel': set(['defaulttests']),
       'mac_chromium_rel': set(['defaulttests']),
-      'win_rel': set(['sync_integration_tests']),
+      'win_chromium_rel': set(['defaulttests']),
     }
   }
diff --git a/chrome/common/net/PRESUBMIT.py b/chrome/common/net/PRESUBMIT.py
index ffcf801..61a8cf2 100644
--- a/chrome/common/net/PRESUBMIT.py
+++ b/chrome/common/net/PRESUBMIT.py
@@ -13,6 +13,6 @@
     'tryserver.chromium': {
       'linux_chromium_rel': set(['defaulttests']),
       'mac_chromium_rel': set(['defaulttests']),
-      'win_rel': set(['sync_integration_tests']),
+      'win_chromium_rel': set(['defaulttests']),
     }
   }
diff --git a/jingle/PRESUBMIT.py b/jingle/PRESUBMIT.py
index f022b03..4ef2a1b3 100644
--- a/jingle/PRESUBMIT.py
+++ b/jingle/PRESUBMIT.py
@@ -13,6 +13,6 @@
     'tryserver.chromium': {
       'linux_chromium_rel': set(['defaulttests']),
       'mac_chromium_rel': set(['defaulttests']),
-      'win_rel': set(['sync_integration_tests']),
+      'win_chromium_rel': set(['defaulttests']),
     }
   }
diff --git a/net/PRESUBMIT.py b/net/PRESUBMIT.py
index 8ac6ca60..ce5542f1 100644
--- a/net/PRESUBMIT.py
+++ b/net/PRESUBMIT.py
@@ -13,7 +13,7 @@
     'tryserver.chromium': {
       'linux_chromium_rel': set(['defaulttests']),
       'mac_chromium_rel': set(['defaulttests']),
-      'win_rel': set(['sync_integration_tests']),
+      'win_chromium_rel': set(['defaulttests']),
     }
   }
   # Changes that touch NSS files will likely need a corresponding OpenSSL edit.
diff --git a/sync/PRESUBMIT.py b/sync/PRESUBMIT.py
index 80e88922..f82e95a 100644
--- a/sync/PRESUBMIT.py
+++ b/sync/PRESUBMIT.py
@@ -13,6 +13,6 @@
     'tryserver.chromium': {
       'linux_chromium_rel': set(['defaulttests']),
       'mac_chromium_rel': set(['defaulttests']),
-      'win_rel': set(['sync_integration_tests']),
+      'win_chromium_rel': set(['defaulttests']),
     }
   }