Commit b209311e authored by Benoît Lizé's avatar Benoît Lizé Committed by Commit Bot

customtabs: Remove feature for parallel request, as it's launched.

We don't need the feature anymore, especially since this will be available
before native is loaded. In this case the feature flag would be at best
misleading (because its setting would not be respected), and at worst cause
crashes (calling a native method before native is loaded).

Bug: 901835
Change-Id: I5e07931674ac1344e3ff3eff805c6b9d15e159d0
Reviewed-on: https://chromium-review.googlesource.com/c/1341833Reviewed-by: default avatarAlexandr Ilin <alexilin@chromium.org>
Commit-Queue: Benoit L <lizeb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610161}
parent 2a6b7600
...@@ -168,7 +168,6 @@ public abstract class ChromeFeatureList { ...@@ -168,7 +168,6 @@ public abstract class ChromeFeatureList {
public static final String CCT_MODULE_CUSTOM_HEADER = "CCTModuleCustomHeader"; public static final String CCT_MODULE_CUSTOM_HEADER = "CCTModuleCustomHeader";
public static final String CCT_MODULE_POST_MESSAGE = "CCTModulePostMessage"; public static final String CCT_MODULE_POST_MESSAGE = "CCTModulePostMessage";
public static final String CCT_EXTERNAL_LINK_HANDLING = "CCTExternalLinkHandling"; public static final String CCT_EXTERNAL_LINK_HANDLING = "CCTExternalLinkHandling";
public static final String CCT_PARALLEL_REQUEST = "CCTParallelRequest";
public static final String CCT_POST_MESSAGE_API = "CCTPostMessageAPI"; public static final String CCT_POST_MESSAGE_API = "CCTPostMessageAPI";
public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect"; public static final String CCT_REDIRECT_PRECONNECT = "CCTRedirectPreconnect";
public static final String CCT_RESOURCE_PREFETCH = "CCTResourcePrefetch"; public static final String CCT_RESOURCE_PREFETCH = "CCTResourcePrefetch";
......
...@@ -1002,13 +1002,11 @@ public class CustomTabsConnection { ...@@ -1002,13 +1002,11 @@ public class CustomTabsConnection {
ThreadUtils.assertOnUiThread(); ThreadUtils.assertOnUiThread();
// The restrictions are: // The restrictions are:
// - Native initialization: Required to get the profile, and the feature state. // - Native initialization: Required to get the profile, and the feature state.
// - Feature check
// - The referrer's origin is allowed. // - The referrer's origin is allowed.
// //
// TODO(lizeb): Relax the restrictions. // TODO(lizeb): Relax the restrictions.
return ChromeBrowserInitializer.getInstance(ContextUtils.getApplicationContext()) return ChromeBrowserInitializer.getInstance(ContextUtils.getApplicationContext())
.hasNativeInitializationCompleted() .hasNativeInitializationCompleted()
&& ChromeFeatureList.isEnabled(ChromeFeatureList.CCT_PARALLEL_REQUEST)
&& mClientManager.isFirstPartyOriginForSession(session, new Origin(referrer)); && mClientManager.isFirstPartyOriginForSession(session, new Origin(referrer));
} }
......
...@@ -2392,7 +2392,6 @@ public class CustomTabActivityTest { ...@@ -2392,7 +2392,6 @@ public class CustomTabActivityTest {
@Test @Test
@SmallTest @SmallTest
@EnableFeatures(ChromeFeatureList.CCT_PARALLEL_REQUEST)
public void testParallelRequest() throws Exception { public void testParallelRequest() throws Exception {
String url = mTestServer.getURL("/echoheader?Cookie"); String url = mTestServer.getURL("/echoheader?Cookie");
Uri requestUri = Uri.parse(mTestServer.getURL("/set-cookie?acookie")); Uri requestUri = Uri.parse(mTestServer.getURL("/set-cookie?acookie"));
......
...@@ -88,7 +88,6 @@ const base::Feature* kFeaturesExposedToJava[] = { ...@@ -88,7 +88,6 @@ const base::Feature* kFeaturesExposedToJava[] = {
&kCCTModuleCache, &kCCTModuleCache,
&kCCTModuleCustomHeader, &kCCTModuleCustomHeader,
&kCCTModulePostMessage, &kCCTModulePostMessage,
&kCCTParallelRequest,
&kCCTPostMessageAPI, &kCCTPostMessageAPI,
&kCCTRedirectPreconnect, &kCCTRedirectPreconnect,
&kCCTReportParallelRequestStatus, &kCCTReportParallelRequestStatus,
...@@ -237,9 +236,6 @@ const base::Feature kCCTModuleCustomHeader{"CCTModuleCustomHeader", ...@@ -237,9 +236,6 @@ const base::Feature kCCTModuleCustomHeader{"CCTModuleCustomHeader",
const base::Feature kCCTModulePostMessage{"CCTModulePostMessage", const base::Feature kCCTModulePostMessage{"CCTModulePostMessage",
base::FEATURE_DISABLED_BY_DEFAULT}; base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kCCTParallelRequest{"CCTParallelRequest",
base::FEATURE_ENABLED_BY_DEFAULT};
const base::Feature kCCTPostMessageAPI{"CCTPostMessageAPI", const base::Feature kCCTPostMessageAPI{"CCTPostMessageAPI",
base::FEATURE_ENABLED_BY_DEFAULT}; base::FEATURE_ENABLED_BY_DEFAULT};
......
...@@ -27,7 +27,6 @@ extern const base::Feature kCCTModule; ...@@ -27,7 +27,6 @@ extern const base::Feature kCCTModule;
extern const base::Feature kCCTModuleCache; extern const base::Feature kCCTModuleCache;
extern const base::Feature kCCTModuleCustomHeader; extern const base::Feature kCCTModuleCustomHeader;
extern const base::Feature kCCTModulePostMessage; extern const base::Feature kCCTModulePostMessage;
extern const base::Feature kCCTParallelRequest;
extern const base::Feature kCCTPostMessageAPI; extern const base::Feature kCCTPostMessageAPI;
extern const base::Feature kCCTRedirectPreconnect; extern const base::Feature kCCTRedirectPreconnect;
extern const base::Feature kCCTReportParallelRequestStatus; extern const base::Feature kCCTReportParallelRequestStatus;
......
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