| Index: third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
|
| diff --git a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
|
| index 81e51aa5553363c562e702cda2244ebd94ac8c21..61fffb76c38d0e9c1df10853f420fd77231001a6 100644
|
| --- a/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
|
| +++ b/third_party/WebKit/Source/platform/weborigin/SecurityOrigin.cpp
|
| @@ -353,15 +353,6 @@ bool SecurityOrigin::canDisplay(const KURL& url) const
|
| return true;
|
| }
|
|
|
| -bool SecurityOrigin::isPotentiallyTrustworthy(String& errorMessage) const
|
| -{
|
| - if (isPotentiallyTrustworthy())
|
| - return true;
|
| -
|
| - errorMessage = "Only secure origins are allowed (see: https://goo.gl/Y0ZkNV).";
|
| - return false;
|
| -}
|
| -
|
| bool SecurityOrigin::isPotentiallyTrustworthy() const
|
| {
|
| ASSERT(m_protocol != "data");
|
| @@ -374,6 +365,12 @@ bool SecurityOrigin::isPotentiallyTrustworthy() const
|
| return false;
|
| }
|
|
|
| +// static
|
| +String SecurityOrigin::isPotentiallyTrustworthyErrorMessage()
|
| +{
|
| + return "Only secure origins are allowed (see: https://goo.gl/Y0ZkNV).";
|
| +}
|
| +
|
| void SecurityOrigin::grantLoadLocalResources()
|
| {
|
| // Granting privileges to some, but not all, documents in a SecurityOrigin
|
|
|