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

chrome/common/chrome_content_client_unittest.cc

Index: chrome/common/chrome_content_client_unittest.cc
diff --git a/chrome/common/chrome_content_client_unittest.cc b/chrome/common/chrome_content_client_unittest.cc
index 5fa08bf3daafc21962ba13ac445cbdfaf07960d2..62591a9d16f282cb00d733e73a9e1c9e04231b58 100644
--- a/chrome/common/chrome_content_client_unittest.cc
+++ b/chrome/common/chrome_content_client_unittest.cc
@@ -4,12 +4,18 @@
 
 #include "chrome/common/chrome_content_client.h"
 
+#include <string.h>
+
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_split.h"
 #include "content/public/common/content_switches.h"
+#include "extensions/common/constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
+#include "url/origin.h"
+#include "url/url_util.h"
 
 namespace {
 
@@ -121,4 +127,16 @@ TEST(ChromeContentClientTest, FindMostRecent) {
 }
 #endif  // defined(ENABLE_PLUGINS)
 
+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