Skip to content

GitLab

T
tangled
Commit 33a4035f authored by Justin Cohen's avatar Justin Cohen Committed by Commit Bot
Browse files
Options

[ios] Revert slimnav back to disabled. 

End the 2 week slimnav experiment, revert the feature back to disabled.

Bug: 925617
Change-Id: Ia9cc075676ae47184ec1a8691b2316f65a926510
Reviewed-on: https://chromium-review.googlesource.com/c/1460441Reviewed-by: default avatarDanyao Wang <danyao@chromium.org>
Reviewed-by: default avatarEugene But <eugenebut@chromium.org>
Commit-Queue: Justin Cohen <justincohen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#630587}
parent 63c078d5
Hide whitespace changes
Inline Side-by-side
Showing with 36 additions and 40 deletions
ios/build/bots/chromium.mac/ios-slimnav.json
View file @ 33a4035f
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone 6s Plus", "device type": "iPhone 6s Plus",
"os": "12.1", "os": "12.1",
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "12.1", "os": "12.1",
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
{ {
"include": "common_tests.json", "include": "common_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "12.1", "os": "12.1",
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone 6s Plus", "device type": "iPhone 6s Plus",
"os": "11.4", "os": "11.4",
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.4", "os": "11.4",
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
{ {
"include": "common_tests.json", "include": "common_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.4", "os": "11.4",
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
{ {
"include": "screen_size_dependent_tests.json", "include": "screen_size_dependent_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone 6s", "device type": "iPhone 6s",
"os": "11.4", "os": "11.4",
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
{ {
"app": "ios_chrome_bookmarks_egtests", "app": "ios_chrome_bookmarks_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
...@@ -129,8 +129,7 @@ ...@@ -129,8 +129,7 @@
{ {
"app": "ios_chrome_manual_fill_egtests", "app": "ios_chrome_manual_fill_egtests",
"test args": [ "test args": [
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging", "--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging,SlimNavigationManager"
"--disable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
...@@ -142,7 +141,7 @@ ...@@ -142,7 +141,7 @@
{ {
"app": "ios_chrome_web_egtests", "app": "ios_chrome_web_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
...@@ -154,7 +153,7 @@ ...@@ -154,7 +153,7 @@
{ {
"app": "ios_chrome_settings_egtests", "app": "ios_chrome_settings_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
...@@ -166,7 +165,7 @@ ...@@ -166,7 +165,7 @@
{ {
"app": "ios_chrome_reading_list_egtests", "app": "ios_chrome_reading_list_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
...@@ -178,7 +177,7 @@ ...@@ -178,7 +177,7 @@
{ {
"app": "ios_showcase_egtests", "app": "ios_showcase_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "11.4", "os": "11.4",
...@@ -190,7 +189,7 @@ ...@@ -190,7 +189,7 @@
{ {
"app": "ios_chrome_bookmarks_egtests", "app": "ios_chrome_bookmarks_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"shard size": 2, "shard size": 2,
"device type": "iPad Air 2", "device type": "iPad Air 2",
...@@ -203,8 +202,7 @@ ...@@ -203,8 +202,7 @@
{ {
"app": "ios_chrome_manual_fill_egtests", "app": "ios_chrome_manual_fill_egtests",
"test args": [ "test args": [
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging", "--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging,SlimNavigationManager"
"--disable-features=SlimNavigationManager"
], ],
"xctest": true, "xctest": true,
"device type": "iPad Air 2", "device type": "iPad Air 2",
...@@ -216,7 +214,7 @@ ...@@ -216,7 +214,7 @@
{ {
"app": "ios_chrome_web_egtests", "app": "ios_chrome_web_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
...@@ -228,7 +226,7 @@ ...@@ -228,7 +226,7 @@
{ {
"app": "ios_chrome_settings_egtests", "app": "ios_chrome_settings_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
...@@ -240,7 +238,7 @@ ...@@ -240,7 +238,7 @@
{ {
"app": "ios_chrome_reading_list_egtests", "app": "ios_chrome_reading_list_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
...@@ -252,7 +250,7 @@ ...@@ -252,7 +250,7 @@
{ {
"app": "ios_showcase_egtests", "app": "ios_showcase_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPad Air 2", "device type": "iPad Air 2",
"os": "12.1", "os": "12.1",
...@@ -264,7 +262,7 @@ ...@@ -264,7 +262,7 @@
{ {
"app": "ios_chrome_bookmarks_egtests", "app": "ios_chrome_bookmarks_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
...@@ -277,8 +275,7 @@ ...@@ -277,8 +275,7 @@
{ {
"app": "ios_chrome_manual_fill_egtests", "app": "ios_chrome_manual_fill_egtests",
"test args": [ "test args": [
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging", "--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging,SlimNavigationManager"
"--disable-features=SlimNavigationManager"
], ],
"xctest": true, "xctest": true,
"device type": "iPhone X", "device type": "iPhone X",
...@@ -290,7 +287,7 @@ ...@@ -290,7 +287,7 @@
{ {
"app": "ios_chrome_web_egtests", "app": "ios_chrome_web_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
...@@ -302,7 +299,7 @@ ...@@ -302,7 +299,7 @@
{ {
"app": "ios_chrome_settings_egtests", "app": "ios_chrome_settings_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
...@@ -314,7 +311,7 @@ ...@@ -314,7 +311,7 @@
{ {
"app": "ios_chrome_reading_list_egtests", "app": "ios_chrome_reading_list_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
...@@ -326,7 +323,7 @@ ...@@ -326,7 +323,7 @@
{ {
"app": "ios_showcase_egtests", "app": "ios_showcase_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
...@@ -338,7 +335,7 @@ ...@@ -338,7 +335,7 @@
{ {
"app": "ios_chrome_bookmarks_egtests", "app": "ios_chrome_bookmarks_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"shard size": 2, "shard size": 2,
"device type": "iPhone X", "device type": "iPhone X",
...@@ -351,8 +348,7 @@ ...@@ -351,8 +348,7 @@
{ {
"app": "ios_chrome_manual_fill_egtests", "app": "ios_chrome_manual_fill_egtests",
"test args": [ "test args": [
"--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging", "--enable-features=AutofillManualFallback,AutofillManualFallbackPhaseTwo,WebFrameMessaging,SlimNavigationManager"
"--disable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
...@@ -364,7 +360,7 @@ ...@@ -364,7 +360,7 @@
{ {
"app": "ios_chrome_web_egtests", "app": "ios_chrome_web_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
...@@ -376,7 +372,7 @@ ...@@ -376,7 +372,7 @@
{ {
"app": "ios_chrome_settings_egtests", "app": "ios_chrome_settings_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
...@@ -388,7 +384,7 @@ ...@@ -388,7 +384,7 @@
{ {
"app": "ios_chrome_reading_list_egtests", "app": "ios_chrome_reading_list_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
...@@ -400,7 +396,7 @@ ...@@ -400,7 +396,7 @@
{ {
"app": "ios_showcase_egtests", "app": "ios_showcase_egtests",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
...@@ -412,7 +408,7 @@ ...@@ -412,7 +408,7 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "11.4", "os": "11.4",
...@@ -423,7 +419,7 @@ ...@@ -423,7 +419,7 @@
{ {
"include": "eg_cq_tests.json", "include": "eg_cq_tests.json",
"test args": [ "test args": [
"--disable-features=SlimNavigationManager" "--enable-features=SlimNavigationManager"
], ],
"device type": "iPhone X", "device type": "iPhone X",
"os": "12.1", "os": "12.1",
......
ios/web/features.mm
View file @ 33a4035f
...@@ -14,7 +14,7 @@ const base::Feature kWebFrameMessaging{"WebFrameMessaging", ...@@ -14,7 +14,7 @@ const base::Feature kWebFrameMessaging{"WebFrameMessaging",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kSlimNavigationManager{"SlimNavigationManager", const base::Feature kSlimNavigationManager{"SlimNavigationManager",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kWKHTTPSystemCookieStore{"WKHTTPSystemCookieStore", const base::Feature kWKHTTPSystemCookieStore{"WKHTTPSystemCookieStore",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment