From 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Date: Fri, 14 Aug 2015 11:38:45 +0200
Subject: BASELINE: Update chromium to 45.0.2454.40

Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
---
 chromium/mojo/tools/data/apptests | 61 +++++++++++++++++++++++++++++----------
 1 file changed, 45 insertions(+), 16 deletions(-)

(limited to 'chromium/mojo/tools/data')

diff --git a/chromium/mojo/tools/data/apptests b/chromium/mojo/tools/data/apptests
index 54a26adbc3c..140ee6a60aa 100644
--- a/chromium/mojo/tools/data/apptests
+++ b/chromium/mojo/tools/data/apptests
@@ -11,15 +11,12 @@
 #     # Optional display name (otherwise the entry for "test" above is used).
 #     "name": "mojo:test_app_url (more details)",
 #     # Optional test type. Valid values:
-#     #   * "gtest" (default)
-#     #   * "gtest_isolated": like "gtest", but run with fixture isolation,
-#     #      i.e., each test in a fresh mojo_shell)
-#     #   * "dart".
+#     #   * "gtest": (default)
+#     #   * "gtest_isolated": like "gtest", but run with fixture isolation.
+#     #                       i.e., each test in a fresh mojo_shell
 #     "type": "gtest",
-#     # Optional arguments for the apptest.
-#     "test-args": ["--an_arg", "another_arg"],
-#     # Optional arguments for the shell.
-#     "shell-args": ["--some-flag-for-the-shell", "--another-flag"],
+#     # Optional arguments for the shell or test.
+#     "args": ["--some-flag-for-the-shell", "--some-flag-for-the-test"],
 #   }
 #
 # TODO(vtl|msw): Add a way of specifying data dependencies.
@@ -27,32 +24,64 @@
 tests = [
   {
     "test": "mojo:clipboard_apptests",
+    "type": "gtest_isolated",
   },
   {
     "test": "mojo:network_service_apptests",
+    "type": "gtest_isolated",
   },
-  # TODO(msw|jam): Fix and enable the shell_apptests: http://crbug.com/479316
+  # TODO(msw|jam): Fix and enable the runner_apptests: http://crbug.com/479316
   #{
-  #  "test": "mojo:shell_apptests",
+  #  "test": "mojo:runner_apptests",
+  #  "type": "gtest_isolated",
   #},
+  {
+    "test": "mojo:view_manager_apptests",
+    "type": "gtest_isolated",
+    "args": ["--use-headless-config"]
+  },
 ]
 
 # TODO(msw): Get these tests passing on Android too. http://crbug.com/486220
 if config.target_os != config.OS_ANDROID:
   tests += [
+    {
+      "test": "mojo:filesystem_apptests",
+      "type": "gtest_isolated",
+    },
     {
       "test": "mojo:html_viewer_apptests",
-      "shell-args": ["--is-headless"],
+      "type": "gtest_isolated",
+      "args": ["--use-test-config"]
+    },
+    {
+      "test": "mojo:html_viewer_apptests",
+      "type": "gtest_isolated",
+      "args": ["--use-test-config", "--oopifs",
+               "--enable-html-viewer-test-interface"]
     },
     {
-      "test": "mojo:view_manager_apptests",
+      "test": "mojo:mandoline_browser_apptests",
+      "type": "gtest_isolated",
+      "args": ["--use-headless-config"]
+    },
+    {
+      "test": "mojo:mandoline_frame_apptests",
+      "type": "gtest_isolated",
+      "args": ["--use-headless-config"]
+    },
+    # TODO(xhwang): Fix and enable mojo:media_pipeline_integration_apptests.
+    # http://crbug.com/501417
+    {
+      "test": "mojo:media_apptests",
       "type": "gtest_isolated",
-      "shell-args": [
-        "--use-headless-config",
-        "--url-mappings=mojo:window_manager=mojo:test_window_manager"
-      ]
     },
     {
       "test": "mojo:resource_provider_apptests",
+      "type": "gtest_isolated",
+    },
+    {
+      "test": "mojo:sql_apptests",
+      "type": "gtest_isolated",
     },
   ]
-- 
cgit v1.2.1