Revert of Enable HTTP/0.9 on non-standard ports by default

chrome/browser/net/errorpage_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 1476 matching lines @@
 // Make sure error page shows correct unicode for IDN.
 IN_PROC_BROWSER_TEST_F(ErrorPageForIDNTest, IDN) {
   // ERR_UNSAFE_PORT will not trigger navigation corrections.
   ui_test_utils::NavigateToURL(
       browser(),
       URLRequestFailedJob::GetMockHttpUrlForHostname(net::ERR_UNSAFE_PORT,
                                                      kHostname));
   EXPECT_TRUE(IsDisplayingText(browser(), kHostnameJSUnicode));
 }
 
-// Make sure HTTP/0.9 is enabled on non-default ports by default.
+// Make sure HTTP/0.9 is disabled on non-default ports by default.
 IN_PROC_BROWSER_TEST_F(ErrorPageTest, Http09WeirdPort) {
-  const char kHttp09Response[] = "JumboShrimp";
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL(std::string("/echo-raw?") +
-                                                kHttp09Response));
-  EXPECT_TRUE(IsDisplayingText(browser(), kHttp09Response));
+      browser(), embedded_test_server()->GetURL("/echo-raw?spam"));
+  ExpectDisplayingLocalErrorPage(browser(), net::ERR_INVALID_HTTP_RESPONSE);
 }
 
 class ErrorPageWithHttp09OnNonDefaultPortsTest : public InProcessBrowserTest {
  public:
   // InProcessBrowserTest:
   void SetUp() override {
     EXPECT_CALL(policy_provider_, IsInitializationComplete(testing::_))
         .WillRepeatedly(testing::Return(true));
     policy::PolicyMap values;
     values.Set(policy::key::kHttp09OnNonDefaultPortsEnabled,
@@ skipping 16 matching lines @@
                        Http09WeirdPortEnabled) {
   const char kHttp09Response[] = "JumboShrimp";
   ASSERT_TRUE(embedded_test_server()->Start());
   ui_test_utils::NavigateToURL(
       browser(), embedded_test_server()->GetURL(std::string("/echo-raw?") +
                                                 kHttp09Response));
   EXPECT_TRUE(IsDisplayingText(browser(), kHttp09Response));
 }
 
 }  // namespace