From 33afd93198288b2f9f1a6501bebd267bf2484ed9 Mon Sep 17 00:00:00 2001
From: Paul Gschwendtner <paulgschwendtner@gmail.com>
Date: Mon, 22 Jan 2018 18:46:11 +0100
Subject: [PATCH] build: remove chrome sandbox workaround (#9498)

In order to align with the `angular/angular` setup, we also remove the temporary Chrome Headless Sandbox workaround in favor of faster Travis CI containers. To be able to still use headless chrome, we specify the `no-sandbox` flag.

Reference https://github.com/angular/angular/pull/21641
---
 .travis.yml               |  7 +------
 test/protractor.conf.js   |  1 +
 test/remote_browsers.json | 10 +++++++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 15000a48029..1f31a8cc5c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,6 @@
 language: node_js
 dist: trusty
-
-# Temporary set sudo to required, because in normal container-based Travis jobs, the Chrome
-# binaries seem to be owned by root, and therefore can't be accessed by Karma. To workaround
-# the issue we temporary grant the CI sudo permissions.
-# https://github.com/travis-ci/travis-ci/issues/8836#issuecomment-356362524.
-sudo: required
+sudo: false
 
 node_js:
   # Use the explicit NodeJS LTS version 8.9.4 to avoid any automatic upgrade of the version.
diff --git a/test/protractor.conf.js b/test/protractor.conf.js
index f42c3a2eff1..885d5b5ca49 100644
--- a/test/protractor.conf.js
+++ b/test/protractor.conf.js
@@ -37,6 +37,7 @@ const config = {
 
 if (process.env['TRAVIS']) {
   const key = require('../scripts/saucelabs/sauce_config');
+
   config.sauceUser = process.env['SAUCE_USERNAME'];
   config.sauceKey = key;
   config.capabilities = {
diff --git a/test/remote_browsers.json b/test/remote_browsers.json
index fc5f3f0c831..e0852b1aec9 100644
--- a/test/remote_browsers.json
+++ b/test/remote_browsers.json
@@ -5,15 +5,19 @@
       "--window-size=1024,768"
     ]
   },
+  "ChromeHeadlessCI": {
+    "base": "ChromeHeadless",
+    "flags": [
+      "--window-size=1024,768",
+      "--no-sandbox"
+    ]
+  },
   "FirefoxHeadless": {
     "base": "Firefox",
     "flags": [
       "-headless"
     ]
   },
-  "ChromeHeadlessCI": {
-    "base": "ChromeHeadlessLocal"
-  },
   "SL_CHROME": {
     "base": "SauceLabs",
     "browserName": "chrome",