Add Origin::CreateFromNormalizedTuple and call from WebSecurityOrigin

url/origin.cc

 // Copyright 2015 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 "url/origin.h"
 
 #include <stdint.h>
 #include <string.h>
 
 #include "base/logging.h"
@@ skipping 21 matching lines @@
     // the "path", which boils down to everything after the scheme. GURL's
     // 'GetContent()' gives us exactly that.
     tuple_ = SchemeHostPort(GURL(url.GetContent()));
   } else {
     tuple_ = SchemeHostPort(url);
   }
 
   unique_ = tuple_.IsInvalid();
 }
 
-Origin::Origin(base::StringPiece scheme, base::StringPiece host, uint16_t port)
-    : tuple_(scheme, host, port) {
+Origin::Origin(base::StringPiece scheme,
+               base::StringPiece host,
+               uint16_t port,
+               bool is_canonicalized)
+    : tuple_(scheme, host, port, is_canonicalized) {
   unique_ = tuple_.IsInvalid();
 }
 
 Origin::~Origin() {
 }
 
 // static
 Origin Origin::UnsafelyCreateOriginWithoutNormalization(
     base::StringPiece scheme,
     base::StringPiece host,
     uint16_t port) {
-  return Origin(scheme, host, port);
+  return Origin(scheme, host, port, false /* is_canonicalized */);
+}
+
+Origin Origin::CreateFromNormalizedTuple(base::StringPiece scheme,
+                                         base::StringPiece host,
+                                         uint16_t port) {
+  return Origin(scheme, host, port, true /* is_canonicalized */);

[Mike West, 2016/10/11 08:38:33]

Nit: Did you consider making this an enum rather than adding a comment next to
an opaque bool? I think that would end up being more readable.

[Charlie Harrison, 2016/10/11 16:29:55]

Done.

 }
 
 std::string Origin::Serialize() const {
   if (unique())
     return "null";
 
   if (scheme() == kFileScheme)
     return "file://";
 
   return tuple_.Serialize();
@@ skipping 26 matching lines @@
 
 std::ostream& operator<<(std::ostream& out, const url::Origin& origin) {
   return out << origin.Serialize();
 }
 
 bool IsSameOriginWith(const GURL& a, const GURL& b) {
   return Origin(a).IsSameOriginWith(Origin(b));
 }
 
 }  // namespace url