DO NOT LAND

net/base/net_util.cc

Index: net/base/net_util.cc
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 26868a085365734c0019bfac045836007844733b..6c8407986842bc3eaca272b883d4ac62a1631189 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -45,15 +45,16 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_byteorder.h"
 #include "base/values.h"
-#include "url/gurl.h"
-#include "url/url_canon.h"
-#include "url/url_canon_ip.h"
-#include "url/url_parse.h"
 #include "net/base/dns_util.h"
 #include "net/base/net_module.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/grit/net_resources.h"
 #include "net/http/http_content_disposition.h"
+#include "url/gurl.h"
+#include "url/origin.h"
+#include "url/url_canon.h"
+#include "url/url_canon_ip.h"
+#include "url/url_parse.h"
 
 #if defined(OS_ANDROID)
 #include "net/android/network_library.h"
@@ -410,6 +411,12 @@ std::string GetHostAndPort(const GURL& url) {
                             url.EffectiveIntPort());
 }
 
+std::string GetHostAndPort(const url::Origin& origin) {
+  // For IPv6 literals, GURL::host() already includes the brackets so it is
+  // safe to just append a colon.
+  return base::StringPrintf("%s:%d", origin.host().c_str(), origin.port());

[Ryan Sleevi, 2015/05/22 02:50:03]

Except Origin.host == HostNoBrackets() == BAY SPLOSIONS

+}
+
 std::string GetHostAndOptionalPort(const GURL& url) {
   // For IPv6 literals, GURL::host() already includes the brackets
   // so it is safe to just append a colon.