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

chrome/common/chrome_content_client_unittest.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 "chrome/common/chrome_content_client.h"
 
+#include <string.h>
+
 #include "base/command_line.h"
 #include "base/strings/string_split.h"
 #include "content/public/common/content_switches.h"
+#include "extensions/common/constants.cc"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
+#include "url/origin.h"
+#include "url/url_util.h"
 
 namespace {
 
 void CheckUserAgentStringOrdering(bool mobile_device) {
   std::vector<std::string> pieces;
 
   // Check if the pieces of the user agent string come in the correct order.
   ChromeContentClient content_client;
   std::string buffer = content_client.GetUserAgent();
 
@@ skipping 53 matching lines @@
   ASSERT_FALSE(command_line->HasSwitch(switches::kUseMobileUserAgent));
   CheckUserAgentStringOrdering(false);
 
   // Do it for mobile devices.
   command_line->AppendSwitch(switches::kUseMobileUserAgent);
   ASSERT_TRUE(command_line->HasSwitch(switches::kUseMobileUserAgent));
   CheckUserAgentStringOrdering(true);
 #endif
 }
 
+TEST(ChromeContentClientTest, AdditionalSchemes) {
+  EXPECT_TRUE(url::IsStandard(
+      extensions::kExtensionScheme,
+      url::Component(0, strlen(extensions::kExtensionScheme))));
+
+  GURL extension_url(
+      "chrome-extension://abcdefghijklmnopqrstuvwxyzabcdef/foo.html");
+  url::Origin origin(extension_url);
+  EXPECT_EQ("chrome-extension://abcdefghijklmnopqrstuvwxyzabcdef",
+            origin.Serialize());
+}
+
 }  // namespace chrome_common