Merge from Chromium at DEPS revision 265802

This commit was generated by merge_to_master.py.

Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281

4 files changed, 30 insertions, 18 deletions

diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index f54e648e06..e9797ebec1 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -22,7 +22,7 @@
       "sandbox_linux_unittests",
       "ui_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "aura_unittests",
       "ash_unittests",
       "app_list_unittests",
@@ -39,7 +39,8 @@
     "gtest_tests": [
       "interactive_ui_tests",
       "browser_tests",
-      "content_browsertests"
+      "content_browsertests",
+      "app_shell_browsertests"
     ]
   },
   "Linux ChromiumOS Tests (dbg)(1)": {
@@ -64,7 +65,7 @@
       "sandbox_linux_unittests",
       "ui_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "aura_unittests",
       "ash_unittests",
       "app_list_unittests",
@@ -80,7 +81,8 @@
   "Linux ChromiumOS Tests (dbg)(2)": {
     "gtest_tests": [
       "browser_tests",
-      "content_browsertests"
+      "content_browsertests",
+      "app_shell_browsertests"
     ]
   },
   "Linux ChromiumOS Tests (dbg)(3)": {
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index 6616686abc..8195c876b9 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -33,7 +33,7 @@
       "sync_unit_tests",
       "unit_tests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "sql_unittests",
       "browser_tests",
       "content_browsertests",
@@ -131,7 +131,7 @@
       "sync_unit_tests",
       "unit_tests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "sql_unittests",
       "webkit_compositor_bindings_unittests",
       "mojo_apps_js_unittests",
@@ -185,7 +185,7 @@
       "sync_unit_tests",
       "unit_tests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "sql_unittests",
       "webkit_compositor_bindings_unittests",
       "mojo_apps_js_unittests",
diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json
index 11e695d0a8..9f3ab61929 100644
--- a/testing/buildbot/chromium.win.json
+++ b/testing/buildbot/chromium.win.json
@@ -31,7 +31,7 @@
       "base_unittests",
       "net_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "aura_unittests",
       "ash_unittests",
       "compositor_unittests",
@@ -51,7 +51,7 @@
       "ui_unittests",
       "content_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       {"test": "browser_tests", "shard_index": 2, "total_shards": 3}
     ]
   },
@@ -87,7 +87,7 @@
       "base_unittests",
       "net_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "aura_unittests",
       "ash_unittests",
       "compositor_unittests",
@@ -107,7 +107,7 @@
       "ui_unittests",
       "content_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       {"test": "browser_tests", "shard_index": 2, "total_shards": 3}
     ]
   },
@@ -143,7 +143,7 @@
       "base_unittests",
       "net_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "aura_unittests",
       "ash_unittests",
       "compositor_unittests",
@@ -163,7 +163,7 @@
       "ui_unittests",
       "content_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       {"test": "browser_tests", "shard_index": 2, "total_shards": 3}
     ]
   },
@@ -208,7 +208,7 @@
       "content_unittests",
       "ui_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "ipc_tests",
       "sync_unit_tests",
       "unit_tests",
@@ -245,7 +245,7 @@
       "ui_unittests",
       "content_unittests",
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "installer_util_unittests",
       "webkit_compositor_bindings_unittests"
     ]
@@ -288,7 +288,7 @@
   "Win8 Aura": {
     "gtest_tests": [
       "views_unittests",
-      "wm_core_unittests",
+      "wm_unittests",
       "aura_unittests",
       "ash_unittests",
       "compositor_unittests",
diff --git a/testing/buildbot/chromium_trybot.json b/testing/buildbot/chromium_trybot.json
index 65bd06404d..0de64e4de9 100644
--- a/testing/buildbot/chromium_trybot.json
+++ b/testing/buildbot/chromium_trybot.json
@@ -1,7 +1,10 @@
 [
   "app_list_unittests",
   "base_unittests",
-  "browser_tests",
+  {
+    "test": "browser_tests",
+    "exclude_builders": ["tryserver.chromium:win_chromium_x64_rel"]
+  },
   "cacheinvalidation_unittests",
   "cc_unittests",
   "chromedriver_unittests",
@@ -14,7 +17,10 @@
   "gfx_unittests",
   "google_apis_unittests",
   "gpu_unittests",
-  "interactive_ui_tests",
+  {
+    "test": "interactive_ui_tests",
+    "exclude_builders": ["tryserver.chromium:win_chromium_x64_rel"]
+  },
   "ipc_tests",
   "jingle_unittests",
   "media_unittests",
@@ -38,6 +44,10 @@
   "ui_unittests",
   "unit_tests",
   {
+    "test": "app_shell_browsertests",
+    "chromium_configs": ["chromium_chromeos", "chromium_chromeos_clang"]
+  },
+  {
     "test": "sandbox_linux_unittests",
     "platforms": ["linux"],
     "args": ["--test-launcher-print-test-stdio=always"]