Add observer interface to PrerenderContents.

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 36 matching lines @@
 
   virtual void StartPrerendering(
       int ALLOW_UNUSED creator_child_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;

[mmenke, 2012/12/03 20:02:47]

This is just weird.  :(

(Not asking you change it)

[gavinp, 2012/12/04 18:04:48]

Yes, it is.

     return true;
   }
 
   virtual bool GetRouteId(int* route_id) const OVERRIDE {
-    *route_id = 0;
+    *route_id = route_id_;
     return true;
   }
 
   FinalStatus expected_final_status() const { return expected_final_status_; }
 
   bool prerendering_has_been_cancelled() const {
     return PrerenderContents::prerendering_has_been_cancelled();
   }
 
  private:
+  static int s_next_route_id_;

[mmenke, 2012/12/03 20:02:47]

I don't think I've seen a single static variable prefixed with s_ in the Chrome
code base.  Doing a quick search seems to verify that this impression is
accurate.

[gavinp, 2012/12/04 18:04:48]

Done.

+  int route_id_;
+
   UnitTestPrerenderManager* test_prerender_manager_;
   FinalStatus expected_final_status_;
 };
 
+int DummyPrerenderContents::s_next_route_id_ = 0;
+
 const gfx::Size kSize(640, 480);
 
 }  // namespace
 
 class UnitTestPrerenderManager : public PrerenderManager {
  public:
   using PrerenderManager::kMinTimeBetweenPrerendersMs;
   using PrerenderManager::kNavigationRecordWindowMs;
 
   explicit UnitTestPrerenderManager(Profile* profile,
@@ skipping 150 matching lines @@
  private:
   PrerenderManager::PrerenderManagerMode prev_mode_;
 };
 
 DummyPrerenderContents::DummyPrerenderContents(
     UnitTestPrerenderManager* test_prerender_manager,
     PrerenderTracker* prerender_tracker,
     const GURL& url,
     Origin origin,
     FinalStatus expected_final_status)
-    : PrerenderContents(test_prerender_manager, prerender_tracker,
+    : PrerenderContents(test_prerender_manager,
                         NULL, url, Referrer(), origin,
                         PrerenderManager::kNoExperiment),
+      route_id_(s_next_route_id_++),
       test_prerender_manager_(test_prerender_manager),
       expected_final_status_(expected_final_status) {
 }
 
 void DummyPrerenderContents::StartPrerendering(
     int ALLOW_UNUSED creator_child_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();
+  NotifyPrerenderStart();
 }
 
 class PrerenderTest : public testing::Test {
  public:
   static const int kDefaultChildId = -1;
   static const int kDefaultRenderViewRouteId = -1;
 
   PrerenderTest() : ui_thread_(BrowserThread::UI, &message_loop_),
                     prerender_manager_(new UnitTestPrerenderManager(
                         &profile_, prerender_tracker())),
@@ skipping 74 matching lines @@
           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,
           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());

[mmenke, 2012/12/03 20:02:47]

Why remove these?

[gavinp, 2012/12/04 18:04:48]

No good reason. Fixed.

   EXPECT_FALSE(duplicate_prerender_handle->IsPrerendering());
 }
 
 // Make sure that if queue a request, and a second prerender request for the
 // same URL comes in, that we drop the second request and keep the first one.
 TEST_F(PrerenderTest, DropSecondRequestTest) {
   GURL url("http://www.google.com/");
   DummyPrerenderContents* prerender_contents =
       prerender_manager()->CreateNextPrerenderContents(
           url,
@@ skipping 818 matching lines @@
   EXPECT_TRUE(AddSimplePrerender(url));
   EXPECT_TRUE(second_prerender_contents->prerendering_has_started());
   ASSERT_EQ(second_prerender_contents,
             prerender_manager()->FindAndUseEntry(url));
   EXPECT_FALSE(IsEmptyPrerenderLinkManager());
 }
 
 #endif  // !(defined(OS_WIN) && defined(USE_AURA))
 
 }  // namespace prerender