| Index: url/mojo/origin_struct_traits.h
|
| diff --git a/url/mojo/origin_struct_traits.h b/url/mojo/origin_struct_traits.h
|
| index 3b8d453eab9041404e5bda1708775805bd0579d6..296e97539c20148bdc366ecf0e296f90dbac9eb1 100644
|
| --- a/url/mojo/origin_struct_traits.h
|
| +++ b/url/mojo/origin_struct_traits.h
|
| @@ -21,11 +21,9 @@ struct StructTraits<url::mojom::OriginDataView, url::Origin> {
|
| static const std::string& suborigin(const url::Origin& r) {
|
| return r.suborigin();
|
| }
|
| - static bool unique(const url::Origin& r) {
|
| - return r.unique();
|
| - }
|
| + static bool opaque(const url::Origin& r) { return r.opaque(); }
|
| static bool Read(url::mojom::OriginDataView data, url::Origin* out) {
|
| - if (data.unique()) {
|
| + if (data.opaque()) {
|
| *out = url::Origin();
|
| } else {
|
| base::StringPiece scheme, host, suborigin;
|
| @@ -37,10 +35,10 @@ struct StructTraits<url::mojom::OriginDataView, url::Origin> {
|
| scheme, host, data.port(), suborigin);
|
| }
|
|
|
| - // If a unique origin was created, but the unique flag wasn't set, then
|
| + // If an opaque origin was created, but the opaque flag wasn't set, then
|
| // the values provided to 'UnsafelyCreateOriginWithoutNormalization' were
|
| // invalid.
|
| - if (!data.unique() && out->unique())
|
| + if (!data.opaque() && out->opaque())
|
| return false;
|
|
|
| return true;
|
|
|