| Index: chrome/browser/prerender/prerender_contents.cc
|
| ===================================================================
|
| --- chrome/browser/prerender/prerender_contents.cc (revision 82944)
|
| +++ chrome/browser/prerender/prerender_contents.cc (working copy)
|
| @@ -4,9 +4,6 @@
|
|
|
| #include "chrome/browser/prerender/prerender_contents.h"
|
|
|
| -#include <algorithm>
|
| -
|
| -#include "base/i18n/rtl.h"
|
| #include "base/process_util.h"
|
| #include "base/task.h"
|
| #include "base/utf_string_conversions.h"
|
| @@ -39,23 +36,6 @@
|
|
|
| namespace prerender {
|
|
|
| -// Compares URLs ignoring any ref for the purposes of matching URLs when
|
| -// prerendering.
|
| -struct PrerenderUrlPredicate {
|
| - explicit PrerenderUrlPredicate(const GURL& url)
|
| - : url_(url) {
|
| - }
|
| -
|
| - bool operator()(const GURL& url) const {
|
| - return url.scheme() == url_.scheme() &&
|
| - url.host() == url_.host() &&
|
| - url.port() == url_.port() &&
|
| - url.path() == url_.path() &&
|
| - url.query() == url_.query();
|
| - }
|
| - GURL url_;
|
| -};
|
| -
|
| void AddChildRoutePair(ResourceDispatcherHost* rdh,
|
| int child_id, int route_id) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
|
| @@ -534,9 +514,8 @@
|
| }
|
|
|
| bool PrerenderContents::MatchesURL(const GURL& url) const {
|
| - return std::find_if(alias_urls_.begin(),
|
| - alias_urls_.end(),
|
| - PrerenderUrlPredicate(url)) != alias_urls_.end();
|
| + return std::find(alias_urls_.begin(), alias_urls_.end(), url)
|
| + != alias_urls_.end();
|
| }
|
|
|
| void PrerenderContents::DidStopLoading() {
|
|
|