Commit b222877f authored by Jérôme Lebel's avatar Jérôme Lebel Committed by Commit Bot

[iOS] Removing calls to IsUIRefreshPhase1Enabled() for Google services settings

Removing calls to IsUIRefreshPhase1Enabled() for Google services
settings.

Bug: 884724
Change-Id: I112df44eb0da39a42954cfb0d471d12c54edfacc
Reviewed-on: https://chromium-review.googlesource.com/c/1309784
Commit-Queue: Jérôme Lebel <jlebel@chromium.org>
Reviewed-by: default avatarSergio Collazos <sczs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#604380}
parent 00796e73
...@@ -454,7 +454,6 @@ source_set("unified_consent_eg_tests") { ...@@ -454,7 +454,6 @@ source_set("unified_consent_eg_tests") {
"//ios/chrome/app/strings:ios_strings_grit", "//ios/chrome/app/strings:ios_strings_grit",
"//ios/chrome/browser/browser_state", "//ios/chrome/browser/browser_state",
"//ios/chrome/browser/ui/authentication:eg_test_support", "//ios/chrome/browser/ui/authentication:eg_test_support",
"//ios/chrome/browser/ui/util",
"//ios/chrome/test/app:test_support", "//ios/chrome/test/app:test_support",
"//ios/chrome/test/earl_grey:test_support", "//ios/chrome/test/earl_grey:test_support",
"//ui/base", "//ui/base",
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
#import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui.h" #import "ios/chrome/browser/ui/authentication/signin_earl_grey_ui.h"
#import "ios/chrome/browser/ui/authentication/signin_earlgrey_utils.h" #import "ios/chrome/browser/ui/authentication/signin_earlgrey_utils.h"
#include "ios/chrome/browser/ui/util/ui_util.h"
#include "ios/chrome/grit/ios_chromium_strings.h" #include "ios/chrome/grit/ios_chromium_strings.h"
#include "ios/chrome/grit/ios_strings.h" #include "ios/chrome/grit/ios_strings.h"
#import "ios/chrome/test/app/chrome_test_util.h" #import "ios/chrome/test/app/chrome_test_util.h"
...@@ -44,8 +43,6 @@ using unified_consent::prefs::kUnifiedConsentGiven; ...@@ -44,8 +43,6 @@ using unified_consent::prefs::kUnifiedConsentGiven;
// Opens the Google services settings view, and closes it. // Opens the Google services settings view, and closes it.
- (void)testOpenGoogleServicesSettings { - (void)testOpenGoogleServicesSettings {
if (!IsUIRefreshPhase1Enabled())
EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
[self openGoogleServicesSettings]; [self openGoogleServicesSettings];
// Assert title and accessibility. // Assert title and accessibility.
...@@ -64,8 +61,6 @@ using unified_consent::prefs::kUnifiedConsentGiven; ...@@ -64,8 +61,6 @@ using unified_consent::prefs::kUnifiedConsentGiven;
// The personalized section is expect to be collapsed and the non-personalized // The personalized section is expect to be collapsed and the non-personalized
// section is expected to be expanded. // section is expected to be expanded.
- (void)testOpeningServicesWhileSignedOut { - (void)testOpeningServicesWhileSignedOut {
if (!IsUIRefreshPhase1Enabled())
EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
[self openGoogleServicesSettings]; [self openGoogleServicesSettings];
[self assertPersonalizedServicesCollapsed:YES]; [self assertPersonalizedServicesCollapsed:YES];
[self assertNonPersonalizedServicesCollapsed:NO]; [self assertNonPersonalizedServicesCollapsed:NO];
...@@ -77,8 +72,6 @@ using unified_consent::prefs::kUnifiedConsentGiven; ...@@ -77,8 +72,6 @@ using unified_consent::prefs::kUnifiedConsentGiven;
// The personalized section and the non-personalized section are expected to be // The personalized section and the non-personalized section are expected to be
// expanded. // expanded.
- (void)testOpeningServicesWhileSignedIn { - (void)testOpeningServicesWhileSignedIn {
if (!IsUIRefreshPhase1Enabled())
EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
[SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]]; [SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]];
[self resetUnifiedConsent]; [self resetUnifiedConsent];
[self openGoogleServicesSettings]; [self openGoogleServicesSettings];
...@@ -93,8 +86,6 @@ using unified_consent::prefs::kUnifiedConsentGiven; ...@@ -93,8 +86,6 @@ using unified_consent::prefs::kUnifiedConsentGiven;
// The personalized section and the non-personalized section are expected to be // The personalized section and the non-personalized section are expected to be
// collapsed. // collapsed.
- (void)testOpeningServicesWhileSignedInAndConsentGiven { - (void)testOpeningServicesWhileSignedInAndConsentGiven {
if (!IsUIRefreshPhase1Enabled())
EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
[SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]]; [SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]];
PrefService* prefService = GetOriginalBrowserState()->GetPrefs(); PrefService* prefService = GetOriginalBrowserState()->GetPrefs();
GREYAssert(prefService->GetBoolean(kUnifiedConsentGiven), GREYAssert(prefService->GetBoolean(kUnifiedConsentGiven),
...@@ -107,8 +98,6 @@ using unified_consent::prefs::kUnifiedConsentGiven; ...@@ -107,8 +98,6 @@ using unified_consent::prefs::kUnifiedConsentGiven;
// Tests to expand/collapse the personalized section. // Tests to expand/collapse the personalized section.
- (void)testTogglePersonalizedServices { - (void)testTogglePersonalizedServices {
if (!IsUIRefreshPhase1Enabled())
EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
[self openGoogleServicesSettings]; [self openGoogleServicesSettings];
[self assertPersonalizedServicesCollapsed:YES]; [self assertPersonalizedServicesCollapsed:YES];
[self togglePersonalizedServicesSection]; [self togglePersonalizedServicesSection];
...@@ -122,8 +111,6 @@ using unified_consent::prefs::kUnifiedConsentGiven; ...@@ -122,8 +111,6 @@ using unified_consent::prefs::kUnifiedConsentGiven;
// Tests to expand/collapse the non-personalized section. // Tests to expand/collapse the non-personalized section.
- (void)testToggleNonPersonalizedServices { - (void)testToggleNonPersonalizedServices {
if (!IsUIRefreshPhase1Enabled())
EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
[self openGoogleServicesSettings]; [self openGoogleServicesSettings];
[self assertNonPersonalizedServicesCollapsed:NO]; [self assertNonPersonalizedServicesCollapsed:NO];
[[EarlGrey selectElementWithMatcher:self.scrollViewMatcher] [[EarlGrey selectElementWithMatcher:self.scrollViewMatcher]
...@@ -138,8 +125,6 @@ using unified_consent::prefs::kUnifiedConsentGiven; ...@@ -138,8 +125,6 @@ using unified_consent::prefs::kUnifiedConsentGiven;
// Tests the "Manage synced data" cell does nothing when the user is not signed // Tests the "Manage synced data" cell does nothing when the user is not signed
// in. // in.
- (void)testOpenManageSyncedDataWebPage { - (void)testOpenManageSyncedDataWebPage {
if (!IsUIRefreshPhase1Enabled())
EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
[self resetUnifiedConsent]; [self resetUnifiedConsent];
[self openGoogleServicesSettings]; [self openGoogleServicesSettings];
[self togglePersonalizedServicesSection]; [self togglePersonalizedServicesSection];
...@@ -153,8 +138,6 @@ using unified_consent::prefs::kUnifiedConsentGiven; ...@@ -153,8 +138,6 @@ using unified_consent::prefs::kUnifiedConsentGiven;
// Tests the "Manage synced data" cell closes the settings, and opens the web // Tests the "Manage synced data" cell closes the settings, and opens the web
// page, while the user is signed in without user consent. // page, while the user is signed in without user consent.
- (void)testOpenManageSyncedDataWebPageWhileSignedIn { - (void)testOpenManageSyncedDataWebPageWhileSignedIn {
if (!IsUIRefreshPhase1Enabled())
EARL_GREY_TEST_SKIPPED(@"This test is UIRefresh only.");
[SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]]; [SigninEarlGreyUI signinWithIdentity:[SigninEarlGreyUtils fakeIdentity1]];
[self resetUnifiedConsent]; [self resetUnifiedConsent];
[self openGoogleServicesSettings]; [self openGoogleServicesSettings];
......
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