| Index: content/shell/renderer/test_runner/web_test_proxy.cc
|
| diff --git a/content/shell/renderer/test_runner/web_test_proxy.cc b/content/shell/renderer/test_runner/web_test_proxy.cc
|
| index 0aa1ee35293e10f60182ae3fbeb59bf3ba8e588f..7a9b989ffd389189c9b96c07109f0f7f2f9e1c46 100644
|
| --- a/content/shell/renderer/test_runner/web_test_proxy.cc
|
| +++ b/content/shell/renderer/test_runner/web_test_proxy.cc
|
| @@ -149,7 +149,7 @@ void PrintResponseDescription(WebTestDelegate* delegate,
|
| }
|
|
|
| std::string URLDescription(const GURL& url) {
|
| - if (url.SchemeIs("file"))
|
| + if (url.SchemeIs(url::kFileScheme))
|
| return url.ExtractFileName();
|
| return url.possibly_invalid_spec();
|
| }
|
| @@ -1158,11 +1158,12 @@ void WebTestProxyBase::WillSendRequest(
|
| }
|
|
|
| std::string host = url.host();
|
| - if (!host.empty() && (url.SchemeIs("http") || url.SchemeIs("https"))) {
|
| + if (!host.empty() &&
|
| + (url.SchemeIs(url::kHttpScheme) || url.SchemeIs(url::kHttpsScheme))) {
|
| if (!IsLocalHost(host) && !IsTestHost(host) &&
|
| !HostIsUsedBySomeTestsToGenerateError(host) &&
|
| - ((!main_document_url.SchemeIs("http") &&
|
| - !main_document_url.SchemeIs("https")) ||
|
| + ((!main_document_url.SchemeIs(url::kHttpScheme) &&
|
| + !main_document_url.SchemeIs(url::kHttpsScheme)) ||
|
| IsLocalHost(main_document_url.host())) &&
|
| !delegate_->AllowExternalPages()) {
|
| delegate_->PrintMessage(std::string("Blocked access to external URL ") +
|
|
|