Add PrerenderStatusEvent on Prerenders

chrome/browser/prerender/prerender_unittest.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 "base/command_line.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/stringprintf.h"
 #include "base/time.h"
 #include "chrome/browser/prerender/prerender_contents.h"
@@ skipping 29 matching lines @@
                          const GURL& url,
                          Origin origin,
                          FinalStatus expected_final_status);
 
   virtual ~DummyPrerenderContents() {
     EXPECT_EQ(expected_final_status_, final_status());
   }
 
   virtual void StartPrerendering(
       int ALLOW_UNUSED creator_child_id,
+      int ALLOW_UNUSED prerender_id,
       const gfx::Size& ALLOW_UNUSED size,
       content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,
       bool is_control_group) OVERRIDE;
 
   virtual bool GetChildId(int* child_id) const OVERRIDE {
     // Having a default child_id of -1 forces pending prerenders not to fail
     // on session storage and cross domain checking.
     *child_id = -1;
     return true;
   }
@@ skipping 175 matching lines @@
     FinalStatus expected_final_status)
     : PrerenderContents(test_prerender_manager, prerender_tracker,
                         NULL, url, Referrer(), origin,
                         PrerenderManager::kNoExperiment),
       test_prerender_manager_(test_prerender_manager),
       expected_final_status_(expected_final_status) {
 }
 
 void DummyPrerenderContents::StartPrerendering(
     int ALLOW_UNUSED creator_child_id,
+    int ALLOW_UNUSED prerender_id,
     const gfx::Size& ALLOW_UNUSED size,
     content::SessionStorageNamespace* ALLOW_UNUSED session_storage_namespace,
     bool is_control_group) {
   // In the base PrerenderContents implementation, StartPrerendering will
   // be called even when the PrerenderManager is part of the control group,
   // but it will early exit before actually creating a new RenderView if
   // |is_control_group| is true;
   if (!is_control_group)
     prerendering_has_started_ = true;
   load_start_time_ = test_prerender_manager_->GetCurrentTimeTicks();
 }
 
 class PrerenderTest : public testing::Test {
  public:
   static const int kDefaultChildId = -1;
+  static const int kDefaultPrerenderId = -1;
   static const int kDefaultRenderViewRouteId = -1;
 
   PrerenderTest() : ui_thread_(BrowserThread::UI, &message_loop_),
                     prerender_manager_(new UnitTestPrerenderManager(
                         &profile_, prerender_tracker())),
                     prerender_link_manager_(
                         new PrerenderLinkManager(prerender_manager_.get())),
                     last_prerender_id_(0) {
     // Enable omnibox prerendering.
     CommandLine::ForCurrentProcess()->AppendSwitchASCII(
@@ skipping 62 matching lines @@
   GURL url("http://www.google.com/");
   DummyPrerenderContents* prerender_contents =
       prerender_manager()->CreateNextPrerenderContents(
           url,
           FINAL_STATUS_USED);
   EXPECT_TRUE(AddSimplePrerender(url));
   EXPECT_TRUE(prerender_contents->prerendering_has_started());
 
   scoped_ptr<PrerenderHandle> duplicate_prerender_handle(
       prerender_manager()->AddPrerenderFromLinkRelPrerender(
-          kDefaultChildId, kDefaultRenderViewRouteId, url,
+          kDefaultChildId, kDefaultPrerenderId, kDefaultRenderViewRouteId, url,
           Referrer(url, WebKit::WebReferrerPolicyDefault), kSize));
 
   EXPECT_TRUE(duplicate_prerender_handle->IsValid());
   EXPECT_TRUE(duplicate_prerender_handle->IsPrerendering());
 
   ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));
 
   EXPECT_FALSE(duplicate_prerender_handle->IsValid());
   EXPECT_FALSE(duplicate_prerender_handle->IsPrerendering());
 }
@@ skipping 266 matching lines @@
 
   GURL pending_url("http://news.google.com/");
 
   DummyPrerenderContents* pending_prerender_contents =
       prerender_manager()->CreateNextPrerenderContents(
           pending_url,
           ORIGIN_GWS_PRERENDER,
           FINAL_STATUS_USED);
   scoped_ptr<PrerenderHandle> pending_prerender_handle(
       prerender_manager()->AddPrerenderFromLinkRelPrerender(
-          child_id, route_id, pending_url,
+          child_id, kDefaultPrerenderId, route_id, pending_url,
           Referrer(url, WebKit::WebReferrerPolicyDefault), kSize));
   DCHECK(pending_prerender_handle.get());
   EXPECT_TRUE(pending_prerender_handle->IsValid());
   EXPECT_TRUE(pending_prerender_handle->IsPending());
 
   EXPECT_TRUE(prerender_contents->prerendering_has_started());
   ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));
 
   EXPECT_FALSE(pending_prerender_handle->IsPending());
   ASSERT_EQ(pending_prerender_contents,
@@ skipping 16 matching lines @@
   // This pending URL has an unsupported scheme, and won't be able
   // to start.
   GURL pending_url("ftp://news.google.com/");
 
   prerender_manager()->CreateNextPrerenderContents(
       pending_url,
       ORIGIN_GWS_PRERENDER,
       FINAL_STATUS_UNSUPPORTED_SCHEME);
   scoped_ptr<PrerenderHandle> pending_prerender_handle(
       prerender_manager()->AddPrerenderFromLinkRelPrerender(
-          child_id, route_id, pending_url,
+          child_id, kDefaultPrerenderId, route_id, pending_url,
           Referrer(url, WebKit::WebReferrerPolicyDefault), kSize));
   DCHECK(pending_prerender_handle.get());
   EXPECT_TRUE(pending_prerender_handle->IsValid());
   EXPECT_TRUE(pending_prerender_handle->IsPending());
 
   EXPECT_TRUE(prerender_contents->prerendering_has_started());
   ASSERT_EQ(prerender_contents, prerender_manager()->FindAndUseEntry(url));
 
   EXPECT_FALSE(pending_prerender_handle->IsValid());
   EXPECT_FALSE(pending_prerender_handle->IsPending());
 }
 
 TEST_F(PrerenderTest, CancelPendingPrerenderTest) {
   GURL url("http://www.google.com/");
   DummyPrerenderContents* prerender_contents =
       prerender_manager()->CreateNextPrerenderContents(
           url,
           FINAL_STATUS_USED);
   EXPECT_TRUE(AddSimplePrerender(url));
 
   int child_id;
   int route_id;
   ASSERT_TRUE(prerender_contents->GetChildId(&child_id));
   ASSERT_TRUE(prerender_contents->GetRouteId(&route_id));
 
   GURL pending_url("http://news.google.com/");
 
   scoped_ptr<PrerenderHandle> pending_prerender_handle(
       prerender_manager()->AddPrerenderFromLinkRelPrerender(
-          child_id, route_id, pending_url,
+          child_id, kDefaultPrerenderId, route_id, pending_url,
           Referrer(url, WebKit::WebReferrerPolicyDefault), kSize));
   DCHECK(pending_prerender_handle.get());
   EXPECT_TRUE(pending_prerender_handle->IsValid());
   EXPECT_TRUE(pending_prerender_handle->IsPending());
 
   EXPECT_TRUE(prerender_contents->prerendering_has_started());
 
   pending_prerender_handle->OnCancel();
   EXPECT_FALSE(pending_prerender_handle->IsValid());
 
@@ skipping 448 matching lines @@
       prerender_manager()->CreateNextPrerenderContents(
           url, FINAL_STATUS_USED);
   EXPECT_TRUE(AddSimplePrerender(url));
   EXPECT_TRUE(second_prerender_contents->prerendering_has_started());
   ASSERT_EQ(second_prerender_contents,
             prerender_manager()->FindAndUseEntry(url));
   EXPECT_FALSE(IsEmptyPrerenderLinkManager());
 }
 
 }  // namespace prerender