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 41 matching lines @@
       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;
   }
 
   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 g_next_route_id_;
+  int route_id_;
+
   UnitTestPrerenderManager* test_prerender_manager_;
   FinalStatus expected_final_status_;
 };
 
+int DummyPrerenderContents::g_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 35 matching lines @@
   PrerenderContents* FindAndUseEntry(const GURL& url) {
     PrerenderData* prerender_data = FindPrerenderData(url, NULL);
     if (!prerender_data)
       return NULL;
     ScopedVector<PrerenderData>::iterator to_erase =
         FindIteratorForPrerenderContents(prerender_data->contents());
     CHECK(to_erase != active_prerenders_.end());
     PrerenderContents* prerender_contents = prerender_data->ReleaseContents();
     active_prerenders_.erase(to_erase);
 
-    prerender_contents->set_final_status(FINAL_STATUS_USED);
+    prerender_contents->SetFinalStatus(FINAL_STATUS_USED);
     prerender_contents->StartPendingPrerenders();
     return prerender_contents;
   }
 
   void AdvanceTime(TimeDelta delta) {
     time_ += delta;
   }
 
   void AdvanceTimeTicks(TimeDelta delta) {
     time_ticks_ += delta;
@@ skipping 94 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_(g_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();

[mmenke, 2012/12/06 19:54:22]

We should not be running this in the control group.  This should run into a
DCHECK in debug builds, I'd think.

[gavinp, 2012/12/07 17:37:04]

Done.

 }

[mmenke, 2012/12/06 19:54:22]

These two methods should be up in the anonymous namespace with
DummyPrerenderContents itself.  Hadn't even realized code like this would
compile.

[gavinp, 2012/12/07 17:37:04]

Tricky. The functions reference the UnitTestPrerenderManager, which is not in
the anonymous namespace, and is defined later.

To do this, we'd have to move the definition of UnitTestPrerenderManager to
before the anonymous namespace, and probably also move many methods out of line.
Is it worth that cost?

[mmenke, 2012/12/07 19:21:16]

Couldn't we just have PrerenderManager defriend UnitTestPrerenderManager, making
functions protected as needed?  Then we could just move the entire test into the
anonymous namespace.

Feel free to leave as-is.

[gavinp, 2012/12/08 17:27:48]

I think you're right, but it's out of scope for this review, so I'm leaving it
as is. I'll upload another CL to clean up this unit test in the way you
suggested.

 
 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())),
                     prerender_link_manager_(
@@ skipping 913 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