Fix prerender histograms for multiple prerender case.

chrome/browser/prerender/prerender_contents.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <functional>
 #include <utility>
 
@@ skipping 151 matching lines @@
     // prerenders.
     prerender_contents_->Destroy(FINAL_STATUS_REGISTER_PROTOCOL_HANDLER);
   }
 
  private:
   PrerenderContents* prerender_contents_;
 };
 
 void PrerenderContents::AddPendingPrerender(
     const base::WeakPtr<PrerenderHandle> weak_prerender_handle,
+    const Origin origin,
     const GURL& url,
     const content::Referrer& referrer,
     const gfx::Size& size) {
   pending_prerenders_.push_back(
-      PendingPrerenderInfo(weak_prerender_handle, url, referrer, size));
+      PendingPrerenderInfo(weak_prerender_handle, origin, url, referrer, size));
 }
 
 bool PrerenderContents::IsPendingEntry(
     const PrerenderHandle& prerender_handle) const {
   for (std::vector<PendingPrerenderInfo>::const_iterator it =
            pending_prerenders_.begin();
        it != pending_prerenders_.end();
        ++it) {
     if (it->weak_prerender_handle.get() == &prerender_handle)
       return true;
@@ skipping 12 matching lines @@
   DCHECK(child_id_ == -1 || session_storage_namespace);
 
   std::vector<PendingPrerenderInfo> pending_prerender_list;
   pending_prerender_list.swap(pending_prerenders_);
   for (std::vector<PendingPrerenderInfo>::iterator it =
            pending_prerender_list.begin();
        it != pending_prerender_list.end();
        ++it) {
     if (it->weak_prerender_handle && it->weak_prerender_handle->IsValid()) {
       prerender_manager_->StartPendingPrerender(
-          it->weak_prerender_handle.get(), ORIGIN_LINK_REL_PRERENDER, child_id_,
+          it->weak_prerender_handle.get(), it->origin, child_id_,
           it->url, it->referrer, it->size, session_storage_namespace);
     }
   }
 }
 
 PrerenderContents::PendingPrerenderInfo::PendingPrerenderInfo(
     const base::WeakPtr<PrerenderHandle> weak_prerender_handle,
+    const Origin origin,
     const GURL& url,
     const content::Referrer& referrer,
     const gfx::Size& size)
     : weak_prerender_handle(weak_prerender_handle),
+      origin(origin),
       url(url),
       referrer(referrer),
       size(size) {
 }
 
 PrerenderContents::PendingPrerenderInfo::~PendingPrerenderInfo() {
 }
 
 PrerenderContents::PrerenderContents(
     PrerenderManager* prerender_manager,
@@ skipping 284 matching lines @@
     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(url)) {
+      prerender_manager_->HasRecentlyBeenNavigatedTo(origin(), url)) {
     Destroy(FINAL_STATUS_RECENTLY_VISITED);
     return false;
   }
 
   alias_urls_.push_back(url);
   InformRenderProcessAboutPrerender(url, true, creator_child_id_);
   return true;
 }
 
 void PrerenderContents::AddAliasURLsFromOtherPrerenderContents(
@@ skipping 169 matching lines @@
 bool PrerenderContents::IsCrossSiteNavigationPending() const {
   if (!prerender_contents_.get() || !prerender_contents_->web_contents())
     return false;
   const WebContents* web_contents = prerender_contents_->web_contents();
   return (web_contents->GetSiteInstance() !=
           web_contents->GetPendingSiteInstance());
 }
 
 
 }  // namespace prerender