| Index: url/BUILD.gn
|
| diff --git a/url/BUILD.gn b/url/BUILD.gn
|
| index c575a9a22499207fc98b8ac93a080aa50b6b76be..2beed041ab3dc5b7c20aa02ab7d52a29f720640a 100644
|
| --- a/url/BUILD.gn
|
| +++ b/url/BUILD.gn
|
| @@ -24,6 +24,8 @@ component("url") {
|
| "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",
|
| @@ -97,11 +99,8 @@ if (!is_android) {
|
| 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",
|
|
|