Introduce 'url::Origin'.

url/BUILD.gn

 # Copyright (c) 2013 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.
 
 import("//testing/test.gni")
 import("//url/config.gni")
 
 # Sets the USE_ICU_ALTERNATIVES_ON_ANDROID define based on the build flag.
 config("url_icu_config") {
   if (use_icu_alternatives_on_android) {
     defines = [ "USE_ICU_ALTERNATIVES_ON_ANDROID=1" ]
   }
 }
 
 component("url") {
   if (is_win) {
     # Don't conflict with Windows' "url.dll".
     output_name = "url_lib"
   }
   sources = [
     "android/url_jni_registrar.cc",
     "android/url_jni_registrar.h",
     "deprecated_serialized_origin.cc",
     "deprecated_serialized_origin.h",
     "gurl.cc",
     "gurl.h",
+    "origin.cc",
+    "origin.h",
     "scheme_host_port.cc",
     "scheme_host_port.h",
     "third_party/mozilla/url_parse.cc",
     "third_party/mozilla/url_parse.h",
     "url_canon.h",
     "url_canon_etc.cc",
     "url_canon_filesystemurl.cc",
     "url_canon_fileurl.cc",
     "url_canon_host.cc",
     "url_canon_icu.cc",
@@ skipping 53 matching lines @@
     ]
   }
 }
 
 # TODO(dpranke): crbug.com/360936. Get this to build and run on Android.
 if (!is_android) {
   test("url_unittests") {
     sources = [
       "deprecated_serialized_origin_unittest.cc",
       "gurl_unittest.cc",
-<<<<<<< HEAD
-=======
       "origin_unittest.cc",
       "scheme_host_port_unittest.cc",
->>>>>>> Feedback.
       "url_canon_icu_unittest.cc",
       "url_canon_unittest.cc",
       "url_parse_unittest.cc",
       "url_test_utils.h",
       "url_util_unittest.cc",
     ]
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
@@ skipping 10 matching lines @@
       "//testing/gtest",
       "//third_party/icu:icuuc",
     ]
 
     if (use_icu_alternatives_on_android) {
       sources -= [ "url_canon_icu_unittest.cc" ]
       deps -= [ "//third_party/icu:icuuc" ]
     }
   }
 }