Commit 4c640582 authored by Tao Bai's avatar Tao Bai Committed by Commit Bot

Revert "Preload HSTS for the .foo gTLD."

This reverts commit 0b1c7760.

Reason for revert: Broke multiple android bots

https://build.chromium.org/p/chromium.android/builders/Android%20Cronet%20Marshmallow%2064bit%20Perf/builds/10980

https://build.chromium.org/p/chromium.android/builders/Android%20Cronet%20Marshmallow%2064bit%20Builder/builds/13581

https://build.chromium.org/p/chromium.android/builders/Android%20Cronet%20Lollipop%20Builder/builds/12030


Original change's description:
> Preload HSTS for the .foo gTLD.
> 
> This CL also adds unit tests for .foo preloading and updates two tests
> that were using http://foo as a test URL.
> 
> There are still other places in the code that use http[s]://foo as a test
> domain. If this change causes issues for them down the line, they should be
> changed to use foo.test or another domain under a test TLD:
> https://tools.ietf.org/html/rfc2606#section-2
> 
> BUG=b/65158868 (Google-internal)
> 
> Change-Id: I8005a3767677e819b8df898ccc073cf1db523d60
> Reviewed-on: https://chromium-review.googlesource.com/669396
> Reviewed-by: Chris Bentzel <cbentzel@chromium.org>
> Reviewed-by: Matt Menke <mmenke@chromium.org>
> Reviewed-by: Tarun Bansal <tbansal@chromium.org>
> Reviewed-by: Lucas Garron <lgarron@chromium.org>
> Commit-Queue: Lucas Garron <lgarron@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#502948}

TBR=cbentzel@chromium.org,mmenke@chromium.org,lgarron@chromium.org,tbansal@chromium.org

Change-Id: If6e17a9f63ebeef3f98ddd24a9a7fe74133eec0d
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/65158868 (Google-internal)
Reviewed-on: https://chromium-review.googlesource.com/673883Reviewed-by: default avatarTao Bai <michaelbai@chromium.org>
Commit-Queue: Tao Bai <michaelbai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#502967}
parent 1a32990c
......@@ -189,7 +189,7 @@ class IOThreadBrowserTestWithPacFileURL : public IOThreadBrowserTest {
IN_PROC_BROWSER_TEST_F(IOThreadBrowserTestWithPacFileURL, FilePac) {
TestURLFetcherDelegate fetcher_delegate;
std::unique_ptr<net::URLFetcher> fetcher =
net::URLFetcher::Create(GURL("http://foo.test:12345/echoheader?Foo"),
net::URLFetcher::Create(GURL("http://foo:12345/echoheader?Foo"),
net::URLFetcher::GET, &fetcher_delegate);
fetcher->AddExtraRequestHeader("Foo: Bar");
fetcher->SetRequestContext(
......
......@@ -173,9 +173,9 @@ TEST_F(DataReductionProxyInterceptorTest, MAYBE_TestJobFactoryChaining) {
Init(std::move(factory1));
net::TestDelegate d;
std::unique_ptr<net::URLRequest> req(default_context_->CreateRequest(
GURL("http://foo.test"), net::DEFAULT_PRIORITY, &d,
TRAFFIC_ANNOTATION_FOR_TESTS));
std::unique_ptr<net::URLRequest> req(
default_context_->CreateRequest(GURL("http://foo"), net::DEFAULT_PRIORITY,
&d, TRAFFIC_ANNOTATION_FOR_TESTS));
req->Start();
base::RunLoop().Run();
......
......@@ -248,7 +248,6 @@
// but other gTLDs and eTLDs are welcome to preload if they are interested.
{ "name": "google", "include_subdomains": true, "mode": "force-https", "pins": "google" },
{ "name": "dev", "include_subdomains": true, "mode": "force-https" },
{ "name": "foo", "include_subdomains": true, "mode": "force-https" },
// Google domains using Expect-CT.
{ "name": "mail.google.com", "include_subdomains": true, "mode": "force-https", "pins": "google", "expect_ct": true, "expect_ct_report_uri": "https://clients3.google.com/ct_upload" },
......@@ -917,7 +917,6 @@ TEST_F(TransportSecurityStateTest, IsPreloaded) {
const std::string aypal = "aypal.com";
const std::string google = "google";
const std::string www_google = "www.google";
const std::string foo = "foo";
TransportSecurityState state;
TransportSecurityState::STSState sts_state;
......@@ -928,7 +927,6 @@ TEST_F(TransportSecurityStateTest, IsPreloaded) {
EXPECT_FALSE(sts_state.include_subdomains);
EXPECT_TRUE(GetStaticDomainState(&state, google, &sts_state, &pkp_state));
EXPECT_TRUE(GetStaticDomainState(&state, www_google, &sts_state, &pkp_state));
EXPECT_TRUE(GetStaticDomainState(&state, foo, &sts_state, &pkp_state));
EXPECT_FALSE(
GetStaticDomainState(&state, a_www_paypal, &sts_state, &pkp_state));
EXPECT_FALSE(
......@@ -1035,8 +1033,6 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(StaticShouldRedirect("ssl.google-analytics.com"));
EXPECT_TRUE(StaticShouldRedirect("google"));
EXPECT_TRUE(StaticShouldRedirect("foo.google"));
EXPECT_TRUE(StaticShouldRedirect("foo"));
EXPECT_TRUE(StaticShouldRedirect("domaintest.foo"));
EXPECT_TRUE(StaticShouldRedirect("gmail.com"));
EXPECT_TRUE(StaticShouldRedirect("www.gmail.com"));
EXPECT_TRUE(StaticShouldRedirect("googlemail.com"));
......
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