Revert "chromeos: Enable SingleProcessMash (in-proc window service) by default""
This reverts commit 1aa56c256936f433f6e9393e844b33fda6bd7bec.
Reason for revert: Various window and input related issues, see
blockers of crbug.com/918537
Original change's description:
> Reland "chromeos: Enable SingleProcessMash (in-proc window service) by default"
>
> This reverts commit 908a62bf055bca31313d18dcc31617241df80b69.
>
> Reason for revert: Text input and omnibox issues are fixed.
>
> Original change's description:
> > Revert "chromeos: Enable SingleProcessMash (in-proc window service) by default"
> >
> > This reverts commit badd8a0fab485b41aee70b4ed463868b7e218359.
> >
> > Reason for revert: Breaks the Wi-Fi network password entry field
> > http://crbug.com/919183
> >
> > Original change's description:
> > > chromeos: Enable SingleProcessMash (in-proc window service) by default
> > >
> > > Turns on the window service (code in //services/ws) and uses it to back
> > > aura and views (code in //ui/aura/mus and //ui/views/mus). Runs the
> > > window service in-process.
> > >
> > > A label "SingleProcessMash enabled" will appear on the desktop
> > > wallpaper to let developers and QA know the feature is enabled.
> > > The label will be removed in a separate CL before this feature
> > > goes to dev channel. Otherwise there are no visible changes.
> > >
> > > Flips the former "single_process_mash_*" bot configs to
> > > "non_single_process_mash_*" and runs them with the feature disabled.
> > > This should keep the old code paths working until we're sure this
> > > feature will stick.
> > >
> > > TBR=sky@chromium.org
> > >
> > > BUG=918537
> > > TEST=single_process_mash_* bots
> > >
> > > Change-Id: I58a30fd81ea12645b1aabc049c7e697ef1d9e72a
> > > Reviewed-on: https://chromium-review.googlesource.com/c/1393467
> > > Reviewed-by: Jun Mukai <mukai@chromium.org>
> > > Reviewed-by: James Cook <jamescook@chromium.org>
> > > Commit-Queue: James Cook <jamescook@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#619508}
> >
> > TBR=jamescook@chromium.org,mukai@chromium.org,sky@chromium.org
> >
> > # Not skipping CQ checks because original CL landed > 1 day ago.
> >
> > Bug: 918537, 919183
> > Change-Id: Ic3b5f0dd5b941d6383fd7290a0a55b60eedce30d
> > Reviewed-on: https://chromium-review.googlesource.com/c/1396702
> > Reviewed-by: James Cook <jamescook@chromium.org>
> > Reviewed-by: Jun Mukai <mukai@chromium.org>
> > Commit-Queue: James Cook <jamescook@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#620103}
>
> TBR=jamescook@chromium.org,mukai@chromium.org,sky@chromium.org
>
> # Not skipping CQ checks because original CL landed > 1 day ago.
>
> Bug: 918537, 919183
> Change-Id: Ie8ec5125558124d756e76d8fdef20e9b3c982e53
> Reviewed-on: https://chromium-review.googlesource.com/c/1399296
> Reviewed-by: James Cook <jamescook@chromium.org>
> Commit-Queue: James Cook <jamescook@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#621156}
TBR=jamescook@chromium.org,mukai@chromium.org,sky@chromium.org
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: 918537, 919183
Change-Id: I3ba65c42be2d1b9747dac544cd73cd2c17f4f000
Reviewed-on: https://chromium-review.googlesource.com/c/1407777
Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#622233}diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 7cd9555..a16f4d7 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -431,9 +431,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_ash_unittests",
+ "name": "single_process_mash_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -510,10 +510,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--override-use-software-gl-for-tests"
],
- "name": "non_single_process_mash_browser_tests",
+ "name": "single_process_mash_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 20
@@ -621,18 +621,6 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
- "--override-use-software-gl-for-tests"
- ],
- "name": "non_single_process_mash_content_browsertests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "shards": 5
- },
- "test": "content_browsertests"
- },
- {
- "args": [
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*"
],
@@ -644,6 +632,18 @@
},
{
"args": [
+ "--enable-features=SingleProcessMash",
+ "--override-use-software-gl-for-tests"
+ ],
+ "name": "single_process_mash_content_browsertests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "shards": 5
+ },
+ "test": "content_browsertests"
+ },
+ {
+ "args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_browsertests",
@@ -661,9 +661,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_content_unittests",
+ "name": "single_process_mash_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -717,9 +717,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_exo_unittests",
+ "name": "single_process_mash_exo_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -788,9 +788,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_interactive_ui_tests",
+ "name": "single_process_mash_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 3
@@ -1042,9 +1042,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_unit_tests",
+ "name": "single_process_mash_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -1137,9 +1137,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_ash_unittests",
+ "name": "single_process_mash_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -1216,10 +1216,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--override-use-software-gl-for-tests"
],
- "name": "non_single_process_mash_browser_tests",
+ "name": "single_process_mash_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
@@ -1327,18 +1327,6 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
- "--override-use-software-gl-for-tests"
- ],
- "name": "non_single_process_mash_content_browsertests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "shards": 5
- },
- "test": "content_browsertests"
- },
- {
- "args": [
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*"
],
@@ -1350,6 +1338,18 @@
},
{
"args": [
+ "--enable-features=SingleProcessMash",
+ "--override-use-software-gl-for-tests"
+ ],
+ "name": "single_process_mash_content_browsertests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "shards": 5
+ },
+ "test": "content_browsertests"
+ },
+ {
+ "args": [
"--enable-features=VizDisplayCompositor"
],
"name": "viz_content_browsertests",
@@ -1367,9 +1367,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_content_unittests",
+ "name": "single_process_mash_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -1423,9 +1423,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_exo_unittests",
+ "name": "single_process_mash_exo_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -1494,9 +1494,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_interactive_ui_tests",
+ "name": "single_process_mash_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 3
@@ -1747,9 +1747,9 @@
},
{
"args": [
- "--disable-features=SingleProcessMash"
+ "--enable-features=SingleProcessMash"
],
- "name": "non_single_process_mash_unit_tests",
+ "name": "single_process_mash_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 896441b..891febaa 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -4168,10 +4168,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_ash_unittests",
+ "name": "single_process_mash_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -4276,11 +4276,11 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--override-use-software-gl-for-tests",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_browser_tests",
+ "name": "single_process_mash_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 30
@@ -4425,19 +4425,6 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
- "--override-use-software-gl-for-tests",
- "--test-launcher-print-test-stdio=always"
- ],
- "name": "non_single_process_mash_content_browsertests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "shards": 5
- },
- "test": "content_browsertests"
- },
- {
- "args": [
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*",
"--test-launcher-print-test-stdio=always"
@@ -4450,6 +4437,19 @@
},
{
"args": [
+ "--enable-features=SingleProcessMash",
+ "--override-use-software-gl-for-tests",
+ "--test-launcher-print-test-stdio=always"
+ ],
+ "name": "single_process_mash_content_browsertests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "shards": 5
+ },
+ "test": "content_browsertests"
+ },
+ {
+ "args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-print-test-stdio=always"
],
@@ -4471,10 +4471,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_content_unittests",
+ "name": "single_process_mash_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -4547,10 +4547,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_exo_unittests",
+ "name": "single_process_mash_exo_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -4640,10 +4640,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_interactive_ui_tests",
+ "name": "single_process_mash_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 3
@@ -5009,10 +5009,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_unit_tests",
+ "name": "single_process_mash_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
@@ -5180,10 +5180,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_ash_unittests",
+ "name": "single_process_mash_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -5354,11 +5354,11 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--override-use-software-gl-for-tests",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_browser_tests",
+ "name": "single_process_mash_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -5592,25 +5592,6 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
- "--override-use-software-gl-for-tests",
- "--test-launcher-print-test-stdio=always"
- ],
- "name": "non_single_process_mash_content_browsertests",
- "swarming": {
- "can_use_on_swarming_builders": true,
- "dimension_sets": [
- {
- "cpu": "x86-64",
- "os": "Ubuntu-14.04"
- }
- ],
- "shards": 5
- },
- "test": "content_browsertests"
- },
- {
- "args": [
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*",
"--test-launcher-print-test-stdio=always"
@@ -5629,6 +5610,25 @@
},
{
"args": [
+ "--enable-features=SingleProcessMash",
+ "--override-use-software-gl-for-tests",
+ "--test-launcher-print-test-stdio=always"
+ ],
+ "name": "single_process_mash_content_browsertests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-14.04"
+ }
+ ],
+ "shards": 5
+ },
+ "test": "content_browsertests"
+ },
+ {
+ "args": [
"--enable-features=VizDisplayCompositor",
"--test-launcher-print-test-stdio=always"
],
@@ -5663,10 +5663,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_content_unittests",
+ "name": "single_process_mash_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -5787,10 +5787,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_exo_unittests",
+ "name": "single_process_mash_exo_unittests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -5940,10 +5940,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_interactive_ui_tests",
+ "name": "single_process_mash_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
@@ -6534,10 +6534,10 @@
},
{
"args": [
- "--disable-features=SingleProcessMash",
+ "--enable-features=SingleProcessMash",
"--test-launcher-print-test-stdio=always"
],
- "name": "non_single_process_mash_unit_tests",
+ "name": "single_process_mash_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index f951e674..1c273bc 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -911,29 +911,6 @@
},
},
},
- 'non_single_process_mash_browser_tests': {
- 'modifications': {
- # chromium.chromiumos
- 'linux-chromeos-dbg': {
- 'swarming': {
- 'shards': 20,
- },
- },
- # chromium.memory
- 'Linux Chromium OS ASan LSan Tests (1)': {
- # These are very slow on the ASAN trybot for some reason.
- # crbug.com/794372
- 'swarming': {
- 'shards': 30,
- },
- },
- 'Linux ChromiumOS MSan Tests': {
- 'swarming': {
- 'shards': 20,
- },
- },
- },
- },
'not_site_per_process_webkit_layout_tests': {
'remove_from': [
# chromium.linux
@@ -1001,6 +978,29 @@
'Linux MSan Tests', # https://crbug.com/831676
],
},
+ 'single_process_mash_browser_tests': {
+ 'modifications': {
+ # chromium.chromiumos
+ 'linux-chromeos-dbg': {
+ 'swarming': {
+ 'shards': 20,
+ },
+ },
+ # chromium.memory
+ 'Linux Chromium OS ASan LSan Tests (1)': {
+ # These are very slow on the ASAN trybot for some reason.
+ # crbug.com/794372
+ 'swarming': {
+ 'shards': 30,
+ },
+ },
+ 'Linux ChromiumOS MSan Tests': {
+ 'swarming': {
+ 'shards': 20,
+ },
+ },
+ },
+ },
'sizes': {
'remove_from': [
'win32-dbg',
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index bcf666c..43e430d30 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -3567,57 +3567,57 @@
},
'ozone_unittests': {},
'ozone_x11_unittests': {},
- 'non_single_process_mash_ash_unittests': {
+ 'single_process_mash_ash_unittests': {
'test': 'ash_unittests',
'args': [
- '--disable-features=SingleProcessMash',
+ '--enable-features=SingleProcessMash',
],
},
- 'non_single_process_mash_browser_tests': {
+ 'single_process_mash_browser_tests': {
'test': 'browser_tests',
'args': [
- '--disable-features=SingleProcessMash',
+ '--enable-features=SingleProcessMash',
'--override-use-software-gl-for-tests'
],
'swarming': {
'shards': 10,
},
},
- 'non_single_process_mash_content_unittests': {
+ 'single_process_mash_content_unittests': {
'test': 'content_unittests',
'args': [
- '--disable-features=SingleProcessMash',
+ '--enable-features=SingleProcessMash',
],
},
- 'non_single_process_mash_content_browsertests': {
+ 'single_process_mash_content_browsertests': {
'test': 'content_browsertests',
'args': [
- '--disable-features=SingleProcessMash',
+ '--enable-features=SingleProcessMash',
'--override-use-software-gl-for-tests'
],
'swarming': {
'shards': 5,
},
},
- 'non_single_process_mash_exo_unittests': {
+ 'single_process_mash_exo_unittests': {
'test': 'exo_unittests',
'args': [
- '--disable-features=SingleProcessMash',
+ '--enable-features=SingleProcessMash',
],
},
- 'non_single_process_mash_interactive_ui_tests': {
+ 'single_process_mash_interactive_ui_tests': {
'test': 'interactive_ui_tests',
'args': [
- '--disable-features=SingleProcessMash'
+ '--enable-features=SingleProcessMash'
],
'swarming': {
'shards': 3,
},
},
- 'non_single_process_mash_unit_tests': {
+ 'single_process_mash_unit_tests': {
'test': 'unit_tests',
'args': [
- '--disable-features=SingleProcessMash'
+ '--enable-features=SingleProcessMash'
],
},
'ui_chromeos_unittests': {},
diff --git a/ui/base/ui_base_features.cc b/ui/base/ui_base_features.cc
index 500df82..9a132426 100644
--- a/ui/base/ui_base_features.cc
+++ b/ui/base/ui_base_features.cc
@@ -128,13 +128,8 @@
const base::Feature kMashOopViz = {"MashOopViz",
base::FEATURE_DISABLED_BY_DEFAULT};
-// Runs the window service in-process. Launch bug https://crbug.com/909816
const base::Feature kSingleProcessMash = {"SingleProcessMash",
-#if defined(OS_CHROMEOS)
- base::FEATURE_ENABLED_BY_DEFAULT};
-#else
base::FEATURE_DISABLED_BY_DEFAULT};
-#endif
bool IsUsingWindowService() {
return IsSingleProcessMash() || IsMultiProcessMash();
