Skip to content

Commit

Permalink
chromeos: Enable SingleProcessMash (in-proc window service) by default
Browse files Browse the repository at this point in the history 
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}
  • Loading branch information
James Cook authored and Commit Bot committed Jan 2, 2019
1 parent 2626d25 commit badd8a0
Show file tree
Hide file tree
Showing 6 changed files with 131 additions and 121 deletions.
5 changes: 5 additions & 0 deletions ash/main.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,17 @@ void ServiceMain(service_manager::mojom::ServiceRequest request) {
if (!enabled_features.empty())
enabled_features += ",";
enabled_features += features::kMash.name;
// Disable SingleProcessMash, even if it's on by default in the test suite.
if (!disabled_features.empty())
disabled_features += ",";
disabled_features += features::kSingleProcessMash.name;
// This code path is really only for testing (production code uses the utility
// process to launch AshService), so it's ok to use a for-testing function.
base::FeatureList::ClearInstanceForTesting();
CHECK(base::FeatureList::InitializeInstance(enabled_features,
disabled_features));
CHECK(base::FeatureList::IsEnabled(features::kMash));
CHECK(!base::FeatureList::IsEnabled(features::kSingleProcessMash));

ui::MaterialDesignController::Initialize();

Expand Down
84 changes: 42 additions & 42 deletions testing/buildbot/chromium.chromiumos.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_ash_unittests",
"name": "non_single_process_mash_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
Expand Down Expand Up @@ -510,10 +510,10 @@
},
{
"args": [
"--enable-features=SingleProcessMash",
"--disable-features=SingleProcessMash",
"--override-use-software-gl-for-tests"
],
"name": "single_process_mash_browser_tests",
"name": "non_single_process_mash_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 20
Expand Down Expand Up @@ -621,24 +621,24 @@
},
{
"args": [
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*"
"--disable-features=SingleProcessMash",
"--override-use-software-gl-for-tests"
],
"name": "perfetto_content_browsertests",
"name": "non_single_process_mash_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"shards": 5
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=SingleProcessMash",
"--override-use-software-gl-for-tests"
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*"
],
"name": "single_process_mash_content_browsertests",
"name": "perfetto_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 5
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
},
Expand All @@ -661,9 +661,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_content_unittests",
"name": "non_single_process_mash_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
Expand Down Expand Up @@ -717,9 +717,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_exo_unittests",
"name": "non_single_process_mash_exo_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
Expand Down Expand Up @@ -788,9 +788,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_interactive_ui_tests",
"name": "non_single_process_mash_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 3
Expand Down Expand Up @@ -1042,9 +1042,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_unit_tests",
"name": "non_single_process_mash_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
Expand Down Expand Up @@ -1137,9 +1137,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_ash_unittests",
"name": "non_single_process_mash_ash_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
Expand Down Expand Up @@ -1216,10 +1216,10 @@
},
{
"args": [
"--enable-features=SingleProcessMash",
"--disable-features=SingleProcessMash",
"--override-use-software-gl-for-tests"
],
"name": "single_process_mash_browser_tests",
"name": "non_single_process_mash_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 10
Expand Down Expand Up @@ -1327,24 +1327,24 @@
},
{
"args": [
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*"
"--disable-features=SingleProcessMash",
"--override-use-software-gl-for-tests"
],
"name": "perfetto_content_browsertests",
"name": "non_single_process_mash_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true
"can_use_on_swarming_builders": true,
"shards": 5
},
"test": "content_browsertests"
},
{
"args": [
"--enable-features=SingleProcessMash",
"--override-use-software-gl-for-tests"
"--enable-features=TracingPerfettoBackend",
"--gtest_filter=TracingControllerTest.*"
],
"name": "single_process_mash_content_browsertests",
"name": "perfetto_content_browsertests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 5
"can_use_on_swarming_builders": true
},
"test": "content_browsertests"
},
Expand All @@ -1367,9 +1367,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_content_unittests",
"name": "non_single_process_mash_content_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
Expand Down Expand Up @@ -1423,9 +1423,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_exo_unittests",
"name": "non_single_process_mash_exo_unittests",
"swarming": {
"can_use_on_swarming_builders": true
},
Expand Down Expand Up @@ -1494,9 +1494,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_interactive_ui_tests",
"name": "non_single_process_mash_interactive_ui_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"shards": 3
Expand Down Expand Up @@ -1747,9 +1747,9 @@
},
{
"args": [
"--enable-features=SingleProcessMash"
"--disable-features=SingleProcessMash"
],
"name": "single_process_mash_unit_tests",
"name": "non_single_process_mash_unit_tests",
"swarming": {
"can_use_on_swarming_builders": true
},
Expand Down
Loading

0 comments on commit badd8a0

Please sign in to comment.