Fix prerender histograms for multiple prerender case.

chrome/browser/prerender/prerender_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 #define CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/prerender/prerender_final_status.h"
+#include "chrome/browser/prerender/prerender_origin.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/referrer.h"
 #include "ui/gfx/size.h"
 
 class Profile;
 class TabContents;
 struct FaviconURL;
 
@@ skipping 196 matching lines @@
 
   // Returns whether a pending cross-site navigation is happening.
   // This could happen with renderer-issued navigations, such as a
   // MouseEvent being dispatched by a link to a website installed as an app.
   bool IsCrossSiteNavigationPending() const;
 
   // Adds a pending prerender to the list. If |weak_prerender_handle| still
   // exists when this page is made visible, it will be launched.
   virtual void AddPendingPrerender(
       base::WeakPtr<PrerenderHandle> weak_prerender_handle,
+      Origin origin,
       const GURL& url,
       const content::Referrer& referrer,
       const gfx::Size& size);
 
   // Returns true if |url| corresponds to a pending prerender.
   bool IsPendingEntry(const PrerenderHandle& prerender_handle) const;
 
   // Reissues any pending prerender requests from the prerendered page.  Also
   // clears the list of pending requests.
   void StartPendingPrerenders();
 
  protected:
   // Information on pages that the prerendered page has tried to prerender.
   struct PendingPrerenderInfo {
     PendingPrerenderInfo(
         base::WeakPtr<PrerenderHandle> weak_prerender_handle,
+        Origin origin,
         const GURL& url,
         const content::Referrer& referrer,
         const gfx::Size& size);
     ~PendingPrerenderInfo();
 
     base::WeakPtr<PrerenderHandle> weak_prerender_handle;
+    Origin origin;
     GURL url;
     content::Referrer referrer;
     gfx::Size size;
   };
 
   PrerenderContents(PrerenderManager* prerender_manager,
                     PrerenderTracker* prerender_tracker,
                     Profile* profile,
                     const GURL& url,
                     const content::Referrer& referrer,
@@ skipping 132 matching lines @@
 
   // Caches pages to be added to the history.
   AddPageVector add_page_vector_;
 
   DISALLOW_COPY_AND_ASSIGN(PrerenderContents);
 };
 
 }  // namespace prerender
 
 #endif  // CHROME_BROWSER_PRERENDER_PRERENDER_CONTENTS_H_