| Index: url/origin.cc
|
| diff --git a/url/origin.cc b/url/origin.cc
|
| index d15ba43f8f64f196e47fd540c3e15632c5c3a61a..e449532791a9ecf2ccd53659cf1c912ded682f8d 100644
|
| --- a/url/origin.cc
|
| +++ b/url/origin.cc
|
| @@ -34,9 +34,9 @@ GURL AddSuboriginToUrl(const GURL& url, const std::string& suborigin) {
|
|
|
| } // namespace
|
|
|
| -Origin::Origin() : unique_(true), suborigin_(std::string()) {}
|
| +Origin::Origin() : opaque_(true), suborigin_(std::string()) {}
|
|
|
| -Origin::Origin(const GURL& url) : unique_(true), suborigin_(std::string()) {
|
| +Origin::Origin(const GURL& url) : opaque_(true), suborigin_(std::string()) {
|
| if (!url.is_valid() || (!url.IsStandard() && !url.SchemeIsBlob()))
|
| return;
|
|
|
| @@ -77,7 +77,7 @@ Origin::Origin(const GURL& url) : unique_(true), suborigin_(std::string()) {
|
| tuple_ = SchemeHostPort(url);
|
| }
|
|
|
| - unique_ = tuple_.IsInvalid();
|
| + opaque_ = tuple_.IsInvalid();
|
| }
|
|
|
| Origin::Origin(base::StringPiece scheme,
|
| @@ -86,7 +86,7 @@ Origin::Origin(base::StringPiece scheme,
|
| base::StringPiece suborigin,
|
| SchemeHostPort::ConstructPolicy policy)
|
| : tuple_(scheme.as_string(), host.as_string(), port, policy) {
|
| - unique_ = tuple_.IsInvalid();
|
| + opaque_ = tuple_.IsInvalid();
|
| suborigin_ = suborigin.as_string();
|
| }
|
|
|
| @@ -96,7 +96,7 @@ Origin::Origin(std::string scheme,
|
| std::string suborigin,
|
| SchemeHostPort::ConstructPolicy policy)
|
| : tuple_(std::move(scheme), std::move(host), port, policy) {
|
| - unique_ = tuple_.IsInvalid();
|
| + opaque_ = tuple_.IsInvalid();
|
| suborigin_ = std::move(suborigin);
|
| }
|
|
|
| @@ -123,7 +123,7 @@ Origin Origin::CreateFromNormalizedTupleWithSuborigin(
|
| }
|
|
|
| std::string Origin::Serialize() const {
|
| - if (unique())
|
| + if (opaque())
|
| return "null";
|
|
|
| if (scheme() == kFileScheme)
|
| @@ -145,7 +145,7 @@ Origin Origin::GetPhysicalOrigin() const {
|
| }
|
|
|
| GURL Origin::GetURL() const {
|
| - if (unique())
|
| + if (opaque())
|
| return GURL();
|
|
|
| if (scheme() == kFileScheme)
|
| @@ -160,7 +160,7 @@ GURL Origin::GetURL() const {
|
| }
|
|
|
| bool Origin::IsSameOriginWith(const Origin& other) const {
|
| - if (unique_ || other.unique_)
|
| + if (opaque_ || other.opaque_)
|
| return false;
|
|
|
| return tuple_.Equals(other.tuple_) && suborigin_ == other.suborigin_;
|
| @@ -171,7 +171,7 @@ bool Origin::IsSamePhysicalOriginWith(const Origin& other) const {
|
| }
|
|
|
| bool Origin::DomainIs(base::StringPiece lower_ascii_domain) const {
|
| - return !unique_ && url::DomainIs(tuple_.host(), lower_ascii_domain);
|
| + return !opaque_ && url::DomainIs(tuple_.host(), lower_ascii_domain);
|
| }
|
|
|
| bool Origin::operator<(const Origin& other) const {
|
|
|