chromium/src
0
Fork 0
Code Activity

DetachedResourceRequestTest: Clean up uses of default-enabled Features

Browse Source 
This removes the use of ChromeFeatureList to enable two features which
are now enabled by default. This also removes those Features from
ChromeFeatureList.

Bug: 1211388
Change-Id: I309bc42fc9d63c85de40d26e5ed4e6c0ca09b0e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911345
Reviewed-by: Benoit L <lizeb@chromium.org>
Reviewed-by: Ella Ge <eirage@chromium.org>
Commit-Queue: Ella Ge <eirage@chromium.org>
Auto-Submit: Lily Chen <chlily@chromium.org>
Cr-Commit-Position: refs/heads/master@{#886343}
This commit is contained in:
Lily Chen
2021-05-25 17:06:32 +00:00
committed by Chromium LUCI CQ
parent 6671992351
commit a08cb7aae5
3 changed files with 3 additions and 11 deletions
chrome
android
javatests
src
org
chromium
chrome
browser
customtabs
DetachedResourceRequestTest.java
browser
flags
android
chrome_feature_list.cc
java
src
org
chromium
chrome
browser
flags
ChromeFeatureList.java

8
chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/DetachedResourceRequestTest.java

@ -393,14 +393,12 @@ public class DetachedResourceRequestTest {
}
/**
* Demonstrates upcoming restrictions on cookies in third party contexts
* Demonstrates that cookies are SameSite=Lax by default, and cookies in third-party contexts
* require both SameSite=None and Secure.
*/
@Test
@SmallTest
@EnableFeatures({ChromeFeatureList.SAME_SITE_BY_DEFAULT_COOKIES,
ChromeFeatureList.COOKIES_WITHOUT_SAME_SITE_MUST_BE_SECURE})
public void
testUpcomingThirdPartyCookiePolicies() throws Exception {
public void testSameSiteLaxByDefaultCookies() throws Exception {
CustomTabsSessionToken session = prepareSession();
CustomTabsTestUtils.warmUpAndWait();
mServer = EmbeddedTestServer.createAndStartHTTPSServer(mContext, ServerCertificate.CERT_OK);

3
chrome/browser/flags/android/chrome_feature_list.cc

@ -54,7 +54,6 @@
#include "content/public/common/content_features.h"
#include "device/fido/features.h"
#include "media/base/media_switches.h"
#include "net/base/features.h"
#include "services/device/public/cpp/device_features.h"
#include "ui/base/ui_base_features.h"
@ -269,8 +268,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kPrefetchNotificationSchedulingIntegration,
&kWebNotesStylize,
&features::kDnsOverHttps,
&net::features::kSameSiteByDefaultCookies,
&net::features::kCookiesWithoutSameSiteMustBeSecure,
&notifications::features::kUseChimeAndroidSdk,
&paint_preview::kPaintPreviewDemo,
&paint_preview::kPaintPreviewShowOnStartup,

3
chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@ -314,8 +314,6 @@ public abstract class ChromeFeatureList {
public static final String CONTEXTUAL_SEARCH_TRANSLATIONS = "ContextualSearchTranslations";
public static final String CONTINUOUS_FEEDS = "ContinuousFeeds";
public static final String CONTINUOUS_SEARCH = "ContinuousSearch";
public static final String COOKIES_WITHOUT_SAME_SITE_MUST_BE_SECURE =
"CookiesWithoutSameSiteMustBeSecure";
public static final String CRITICAL_PERSISTED_TAB_DATA = "CriticalPersistedTabData";
public static final String DARKEN_WEBSITES_CHECKBOX_IN_THEMES_SETTING =
"DarkenWebsitesCheckboxInThemesSetting";
@ -440,7 +438,6 @@ public abstract class ChromeFeatureList {
public static final String RELATED_SEARCHES_UI = "RelatedSearchesUi";
public static final String REQUEST_DESKTOP_SITE_FOR_TABLETS = "RequestDesktopSiteForTablets";
public static final String SAFE_BROWSING_DELAYED_WARNINGS = "SafeBrowsingDelayedWarnings";
public static final String SAME_SITE_BY_DEFAULT_COOKIES = "SameSiteByDefaultCookies";
public static final String SEARCH_ENGINE_PROMO_EXISTING_DEVICE =
"SearchEnginePromo.ExistingDevice";
public static final String SEARCH_ENGINE_PROMO_NEW_DEVICE = "SearchEnginePromo.NewDevice";