Revert of Allow url::SchemeHostPort to hold non-file scheme without port

google_apis/drive/drive_api_url_generator_unittest.cc

 // Copyright (c) 2013 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 "google_apis/drive/drive_api_url_generator.h"
 
 #include "google_apis/drive/test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 #include "url/url_util.h"
@@ skipping 44 matching lines @@
   EXPECT_EQ(
       "https://www.example.com/drive/v2/files/file%3Afile_id",
       url_generator_.GetFilesGetUrl("file:file_id", false, GURL()).spec());
 
   // If |use_internal_endpoint| is true, the generated url should point to the
   // v2internal.
   EXPECT_EQ("https://www.example.com/drive/v2internal/files/0ADK06pfg",
             url_generator_.GetFilesGetUrl("0ADK06pfg", true, GURL()).spec());
 
   // If |embed_origin| is not empty, it should be added as a query parameter.
-  url::AddStandardScheme("chrome-extension", url::SCHEME_WITHOUT_PORT);
+  url::AddStandardScheme("chrome-extension");
   EXPECT_EQ(
       "https://www.example.com/drive/v2/files/0ADK06pfg"
       "?embedOrigin=chrome-extension%3A%2F%2Ftest",
       url_generator_.GetFilesGetUrl("0ADK06pfg", false,
                                     GURL("chrome-extension://test")).spec());
   EXPECT_EQ(
       "https://www.example.com/drive/v2internal/files/0ADK06pfg"
       "?embedOrigin=chrome-extension%3A%2F%2Ftest",
       url_generator_.GetFilesGetUrl("0ADK06pfg", true,
                                     GURL("chrome-extension://test")).spec());
@@ skipping 291 matching lines @@
       "0ADK06pfg?width=360&height=360&crop=true",
       url_generator_.GetThumbnailUrl("0ADK06pfg", 360, 360, true).spec());
 }
 
 TEST_F(DriveApiUrlGeneratorTest, BatchUploadUrl) {
   EXPECT_EQ("https://www.example.com/upload/drive",
             url_generator_.GetBatchUploadUrl().spec());
 }
 
 }  // namespace google_apis