| Index: third_party/WebKit/Source/platform/mojo/SecurityOriginStructTraits.h
|
| diff --git a/third_party/WebKit/Source/platform/mojo/SecurityOriginStructTraits.h b/third_party/WebKit/Source/platform/mojo/SecurityOriginStructTraits.h
|
| index 402e50fd46ac8162fd37fabfb306ce2386db9abd..bf0b577ae0cac0f27c4fc0a16322d0a2836081cc 100644
|
| --- a/third_party/WebKit/Source/platform/mojo/SecurityOriginStructTraits.h
|
| +++ b/third_party/WebKit/Source/platform/mojo/SecurityOriginStructTraits.h
|
| @@ -23,12 +23,12 @@ struct StructTraits<url::mojom::blink::Origin::DataView,
|
| static uint16_t port(const RefPtr<::blink::SecurityOrigin>& origin) {
|
| return origin->effectivePort();
|
| }
|
| - static bool unique(const RefPtr<::blink::SecurityOrigin>& origin) {
|
| + static bool opaque(const RefPtr<::blink::SecurityOrigin>& origin) {
|
| return origin->isUnique();
|
| }
|
| static bool Read(url::mojom::blink::Origin::DataView data,
|
| RefPtr<::blink::SecurityOrigin>* out) {
|
| - if (data.unique()) {
|
| + if (data.opaque()) {
|
| *out = ::blink::SecurityOrigin::createUnique();
|
| } else {
|
| WTF::String scheme;
|
| @@ -39,9 +39,9 @@ struct StructTraits<url::mojom::blink::Origin::DataView,
|
| *out = ::blink::SecurityOrigin::create(scheme, host, data.port());
|
| }
|
|
|
| - // If a unique origin was created, but the unique flag wasn't set, then
|
| + // If a unique origin was created, but the opaque flag wasn't set, then
|
| // the values provided to 'create' were invalid.
|
| - if (!data.unique() && (*out)->isUnique())
|
| + if (!data.opaque() && (*out)->isUnique())
|
| return false;
|
|
|
| return true;
|
|
|