Add observer interface to PrerenderContents.

chrome/browser/prerender/prerender_unittest.cc

Index: chrome/browser/prerender/prerender_unittest.cc
diff --git a/chrome/browser/prerender/prerender_unittest.cc b/chrome/browser/prerender/prerender_unittest.cc
index b530a2874eee902997b53ea0819d2c99c6f65258..13617a4d8800961dda3b9e3b22a52fb752a45599 100644
--- a/chrome/browser/prerender/prerender_unittest.cc
+++ b/chrome/browser/prerender/prerender_unittest.cc
@@ -59,7 +59,7 @@ class DummyPrerenderContents : public PrerenderContents {
   }
 
   virtual bool GetRouteId(int* route_id) const OVERRIDE {
-    *route_id = 0;
+    *route_id = route_id_;
     return true;
   }
 
@@ -70,10 +70,15 @@ class DummyPrerenderContents : public PrerenderContents {
   }
 
  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
@@ -129,7 +134,7 @@ class UnitTestPrerenderManager : public PrerenderManager {
     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;
   }
@@ -244,9 +249,10 @@ DummyPrerenderContents::DummyPrerenderContents(
     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) {
 }
@@ -263,6 +269,7 @@ void DummyPrerenderContents::StartPrerendering(
   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 {