Changing URL match method to support fragments.

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prerender/prerender_contents.h"
 
 #include "base/process_util.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/background_contents_service.h"
@@ skipping 15 matching lines @@
 #include "content/browser/renderer_host/resource_request_details.h"
 #include "content/browser/site_instance.h"
 #include "content/common/notification_service.h"
 #include "content/common/view_messages.h"
 #include "ui/gfx/rect.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/mach_broker_mac.h"
 #endif
 
+#include <algorithm>

[mmenke, 2011/04/22 18:24:45]

This should go up top, above #include "base/process_util.h"

[dominich, 2011/04/22 18:35:15]

Done.

+
 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.host() == url_.host() &&

[mmenke, 2011/04/22 18:24:45]

Should probably have scheme in here to reduce the chance of breakages if/when we
allow prerendering of SSL URLs.

[dominich, 2011/04/22 18:35:15]

Done.

+           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));
   rdh->AddPrerenderChildRoutePair(child_id, route_id);
 }
 
 void RemoveChildRoutePair(ResourceDispatcherHost* rdh,
                           int child_id, int route_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   rdh->RemovePrerenderChildRoutePair(child_id, route_id);
@@ skipping 436 matching lines @@
 }
 
 bool PrerenderContents::AddAliasURL(const GURL& url) {
   if (!url.SchemeIs("http"))
     return false;
   alias_urls_.push_back(url);
   return true;
 }
 
 bool PrerenderContents::MatchesURL(const GURL& url) const {
-  return std::find(alias_urls_.begin(), alias_urls_.end(), url)
-      != alias_urls_.end();
+  return std::find_if(alias_urls_.begin(),
+                      alias_urls_.end(),
+                      PrerenderUrlPredicate(url)) != alias_urls_.end();
 }
 
 void PrerenderContents::DidStopLoading() {
   has_stopped_loading_ = true;
 }
 
 void PrerenderContents::Destroy(FinalStatus final_status) {
   prerender_manager_->RemoveEntry(this);
   set_final_status(final_status);
   delete this;
@@ skipping 35 matching lines @@
     return;
 
   size_t private_bytes, shared_bytes;
   if (metrics->GetMemoryBytes(&private_bytes, &shared_bytes)) {
     if (private_bytes > kMaxPrerenderPrivateMB * 1024 * 1024)
       Destroy(FINAL_STATUS_MEMORY_LIMIT_EXCEEDED);
   }
 }
 
 }  // namespace prerender