Commit 920d8f93 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Revert "Enables kInfobarUIRebootOnlyiOS13 by default"

This reverts commit b7db0ccb.

Reason for revert: This causes code to dereference nullptr on iOS 12, thus causing consistent crashed.

Original change's description:
> Enables kInfobarUIRebootOnlyiOS13 by default
> 
> This is now needed in order to enable this locally and not via a finch
> config which might not land before the re-sping gets to users.
> 
> Bug: 1071853
> Change-Id: I71b42ca95e54197ddf76b4301616be36c37ad1ca
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2157505
> Commit-Queue: Sergio Collazos <sczs@chromium.org>
> Reviewed-by: Eugene But <eugenebut@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#760756}

TBR=eugenebut@chromium.org,sczs@chromium.org

Change-Id: I534ea0a7d177a3a5452d91ea4bf945375cd2f606
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1071853, 1073091
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159469Reviewed-by: default avatarSylvain Defresne <sdefresne@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#760984}
parent b4bf7e6b
......@@ -129,7 +129,6 @@ source_set("eg_tests") {
"//ios/chrome/browser/download",
"//ios/chrome/browser/download:test_support",
"//ios/chrome/browser/ui/browser_view",
"//ios/chrome/browser/ui/infobars:feature_flags",
"//ios/chrome/browser/ui/infobars/banners:public",
"//ios/chrome/browser/ui/util",
"//ios/chrome/test:eg_test_support",
......@@ -169,7 +168,6 @@ source_set("eg2_tests") {
"//ios/chrome/browser:chrome_url_constants",
"//ios/chrome/browser/download:mime_types",
"//ios/chrome/browser/download:test_support",
"//ios/chrome/browser/ui/infobars:feature_flags",
"//ios/chrome/browser/ui/infobars/banners:public",
"//ios/chrome/test:eg_test_support+eg2",
"//ios/chrome/test/earl_grey:eg_test_support+eg2",
......
......@@ -12,7 +12,6 @@
#include "ios/chrome/browser/download/download_test_util.h"
#include "ios/chrome/browser/download/pass_kit_mime_type.h"
#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_constants.h"
#import "ios/chrome/browser/ui/infobars/infobar_feature.h"
#include "ios/chrome/grit/ios_strings.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_test_case.h"
......@@ -87,9 +86,7 @@ std::unique_ptr<net::test_server::HttpResponse> GetResponse(
// Turn on Messages UI.
#if defined(CHROME_EARL_GREY_1)
_featureList.InitWithFeatures(
/*enabled_features=*/{kIOSInfobarUIReboot},
/*disabled_features=*/{kInfobarUIRebootOnlyiOS13});
_featureList.InitAndEnableFeature(kIOSInfobarUIReboot);
#endif
self.testServer->RegisterRequestHandler(base::Bind(&GetResponse));
......@@ -99,7 +96,6 @@ std::unique_ptr<net::test_server::HttpResponse> GetResponse(
- (AppLaunchConfiguration)appConfigurationForTestCase {
AppLaunchConfiguration config;
config.features_enabled.push_back(kIOSInfobarUIReboot);
config.features_disabled.push_back(kInfobarUIRebootOnlyiOS13);
return config;
}
......
......@@ -10,7 +10,6 @@
#include "components/infobars/core/infobar_feature.h"
#import "ios/chrome/browser/ui/infobars/banners/infobar_banner_constants.h"
#import "ios/chrome/browser/ui/infobars/infobar_constants.h"
#import "ios/chrome/browser/ui/infobars/infobar_feature.h"
#import "ios/chrome/browser/ui/infobars/infobar_manager_app_interface.h"
#import "ios/chrome/test/earl_grey/chrome_earl_grey.h"
#import "ios/chrome/test/earl_grey/chrome_matchers.h"
......@@ -91,7 +90,6 @@ void VerifyTestInfoBarVisibleForCurrentTab(bool visible, NSString* message) {
- (AppLaunchConfiguration)appConfigurationForTestCase {
AppLaunchConfiguration config;
config.features_enabled.push_back(kIOSInfobarUIReboot);
config.features_disabled.push_back(kInfobarUIRebootOnlyiOS13);
return config;
}
......@@ -201,9 +199,7 @@ void VerifyTestInfoBarVisibleForCurrentTab(bool visible, NSString* message) {
- (void)testInfobarTopMostVisible {
// Turn on Messages UI.
#if defined(CHROME_EARL_GREY_1)
_featureList.InitWithFeatures(
/*enabled_features=*/{kIOSInfobarUIReboot},
/*disabled_features=*/{kInfobarUIRebootOnlyiOS13});
_featureList.InitAndEnableFeature(kIOSInfobarUIReboot);
#endif
// Open a new tab and navigate to the test page.
......@@ -247,9 +243,7 @@ void VerifyTestInfoBarVisibleForCurrentTab(bool visible, NSString* message) {
- (void)testInfobarTallerLayout {
// Turn on Messages UI.
#if defined(CHROME_EARL_GREY_1)
_featureList.InitWithFeatures(
/*enabled_features=*/{kIOSInfobarUIReboot},
/*disabled_features=*/{kInfobarUIRebootOnlyiOS13});
_featureList.InitAndEnableFeature(kIOSInfobarUIReboot);
#endif
// Open a new tab and navigate to the test page.
......
......@@ -40,8 +40,8 @@ const base::Feature kSaveCardInfobarMessagesUI{
const base::Feature kTranslateInfobarMessagesUI{
"TranslateInfobarMessagesUI", base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kInfobarUIRebootOnlyiOS13{"InfobarUIRebootOnlyiOS13",
base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kInfobarUIRebootOnlyiOS13{
"InfobarUIRebootOnlyiOS13", base::FEATURE_DISABLED_BY_DEFAULT};
bool IsInfobarUIRebootEnabled() {
if (base::FeatureList::IsEnabled(kInfobarUIRebootOnlyiOS13)) {
......
......@@ -257,9 +257,7 @@ void TestResponseProvider::GetLanguageResponse(
[super setUp];
#if defined(CHROME_EARL_GREY_1)
_featureList.InitWithFeatures(
/*enabled_features=*/{kIOSInfobarUIReboot},
/*disabled_features=*/{kInfobarUIRebootOnlyiOS13});
_featureList.InitAndEnableFeature(kIOSInfobarUIReboot);
#endif
// Set up the fake URL for the translate script to hit the mock HTTP server.
......@@ -278,7 +276,6 @@ void TestResponseProvider::GetLanguageResponse(
- (AppLaunchConfiguration)appConfigurationForTestCase {
AppLaunchConfiguration config;
config.features_enabled.push_back(kIOSInfobarUIReboot);
config.features_disabled.push_back(kInfobarUIRebootOnlyiOS13);
return config;
}
......
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