Add suborigins to 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 65 matching lines @@
   } else {
     tuple_ = SchemeHostPort(url);
   }
 
   unique_ = tuple_.IsInvalid();
 }
 
 Origin::Origin(base::StringPiece scheme,
                base::StringPiece host,
                uint16_t port,
+               base::StringPiece suborigin,
                SchemeHostPort::ConstructPolicy policy)
     : tuple_(scheme, host, port, policy) {
   unique_ = tuple_.IsInvalid();
+  suborigin_ = suborigin.as_string();
 }
 
 Origin::~Origin() {
 }
 
 // static
 Origin Origin::UnsafelyCreateOriginWithoutNormalization(
     base::StringPiece scheme,
     base::StringPiece host,
     uint16_t port) {
-  return Origin(scheme, host, port, SchemeHostPort::CHECK_CANONICALIZATION);
+  return Origin(scheme, host, port, "", SchemeHostPort::CHECK_CANONICALIZATION);
 }
 
 Origin Origin::CreateFromNormalizedTuple(base::StringPiece scheme,
                                          base::StringPiece host,
                                          uint16_t port) {
-  return Origin(scheme, host, port, SchemeHostPort::ALREADY_CANONICALIZED);
+  return CreateFromNormalizedTupleWithSuborigin(scheme, host, port, "");
+}
+
+Origin Origin::CreateFromNormalizedTupleWithSuborigin(
+    base::StringPiece scheme,
+    base::StringPiece host,
+    uint16_t port,
+    base::StringPiece suborigin) {
+  return Origin(scheme, host, port, suborigin,
+                SchemeHostPort::ALREADY_CANONICALIZED);
 }
 
 std::string Origin::Serialize() const {
   if (unique())
     return "null";
 
   if (scheme() == kFileScheme)
     return "file://";
 
   if (!suborigin_.empty()) {
@@ skipping 51 matching lines @@
 
 bool IsSameOriginWith(const GURL& a, const GURL& b) {
   return Origin(a).IsSameOriginWith(Origin(b));
 }
 
 bool IsSamePhysicalOriginWith(const GURL& a, const GURL& b) {
   return Origin(a).IsSamePhysicalOriginWith(Origin(b));
 }
 
 }  // namespace url