Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: chrome/browser/prerender/prerender_contents.cc

Issue 6905013: Revert 82928 - Changing URL match method to support fragments.BUG=79898TEST=PrerenderBrowserTest.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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() {
« no previous file with comments | « chrome/browser/prerender/prerender_browsertest.cc ('k') | chrome/browser/prerender/prerender_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698