| Index: chrome/browser/prerender/prerender_contents.cc
|
| diff --git a/chrome/browser/prerender/prerender_contents.cc b/chrome/browser/prerender/prerender_contents.cc
|
| index f818112c1be976cf30c23a09f19476483d80bcc8..75e8d51fba53cc269e26c415cb81edb87b0741d1 100644
|
| --- a/chrome/browser/prerender/prerender_contents.cc
|
| +++ b/chrome/browser/prerender/prerender_contents.cc
|
| @@ -523,18 +523,11 @@ bool PrerenderContents::OnMessageReceived(const IPC::Message& message) {
|
| }
|
|
|
| bool PrerenderContents::CheckURL(const GURL& url) {
|
| - const bool http = url.SchemeIs(content::kHttpScheme);
|
| - const bool https = url.SchemeIs(content::kHttpsScheme);
|
| - if (!http && !https) {
|
| + if (!url.SchemeIsHTTPOrHTTPS()) {
|
| DCHECK_NE(MATCH_COMPLETE_REPLACEMENT_PENDING, match_complete_status_);
|
| Destroy(FINAL_STATUS_UNSUPPORTED_SCHEME);
|
| return false;
|
| }
|
| - if (https && !prerender_manager_->config().https_allowed) {
|
| - DCHECK_NE(MATCH_COMPLETE_REPLACEMENT_PENDING, match_complete_status_);
|
| - Destroy(FINAL_STATUS_HTTPS);
|
| - return false;
|
| - }
|
| if (match_complete_status_ != MATCH_COMPLETE_REPLACEMENT_PENDING &&
|
| prerender_manager_->HasRecentlyBeenNavigatedTo(origin(), url)) {
|
| Destroy(FINAL_STATUS_RECENTLY_VISITED);
|
|
|