Added prerendering to omnibox.

chrome/browser/prerender/prerender_tracker_unittest.cc

Index: chrome/browser/prerender/prerender_tracker_unittest.cc
diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc
index 2518b69199fd31b0cad1effbcd96b2052698cb13..c1cd80b24073d87f457f5e0c8f4c231a094bd55f 100644
--- a/chrome/browser/prerender/prerender_tracker_unittest.cc
+++ b/chrome/browser/prerender/prerender_tracker_unittest.cc
@@ -22,7 +22,7 @@ class TestPrerenderManager : public PrerenderManager {
     rate_limit_enabled_ = false;
   }
 
-  virtual void DestroyPreloadForChildRouteIdPair(
+  virtual void DestroyPrerenderForChildRouteIdPair(
       const std::pair<int, int>& child_route_id_pair,
       FinalStatus final_status) OVERRIDE {
     cancelled_id_pairs_.insert(child_route_id_pair);
@@ -111,8 +111,8 @@ TEST_F(PrerenderTrackerTest, PrerenderTrackerUsed) {
       0, 0, FINAL_STATUS_TIMED_OUT));
   EXPECT_EQ(FINAL_STATUS_USED, GetCurrentStatus(0, 0));
 
-  // This would call DestroyPreloadForChildRouteIdPair(), if the prerender were
-  // cancelled.
+  // This would call DestroyPrerenderForChildRouteIdPair(), if the prerender
+  // were cancelled.
   RunEvents();
 
   // These functions should all behave as before.
@@ -121,7 +121,7 @@ TEST_F(PrerenderTrackerTest, PrerenderTrackerUsed) {
       0, 0, FINAL_STATUS_TIMED_OUT));
   EXPECT_EQ(FINAL_STATUS_USED, GetCurrentStatus(0, 0));
 
-  // This calls DestroyPreloadForChildRouteIdPair().
+  // This calls DestroyPrerenderForChildRouteIdPair().
   prerender_tracker()->OnPrerenderingFinished(0, 0);
   EXPECT_TRUE(prerender_tracker()->IsPrerenderingOnIOThread(0, 0));
 
@@ -152,7 +152,7 @@ TEST_F(PrerenderTrackerTest, PrerenderTrackerCancelled) {
       0, 0, FINAL_STATUS_TIMED_OUT));
   EXPECT_EQ(FINAL_STATUS_HTTPS, GetCurrentStatus(0, 0));
 
-  // This calls DestroyPreloadForChildRouteIdPair().
+  // This calls DestroyPrerenderForChildRouteIdPair().
   RunEvents();
   EXPECT_TRUE(prerender_manager()->WasPrerenderCancelled(0, 0));
 
@@ -192,7 +192,7 @@ TEST_F(PrerenderTrackerTest, PrerenderTrackerCancelledOnIO) {
       0, 0, FINAL_STATUS_HTTPS));
   EXPECT_EQ(FINAL_STATUS_TIMED_OUT, GetCurrentStatus(0, 0));
 
-  // This calls DestroyPreloadForChildRouteIdPair().
+  // This calls DestroyPrerenderForChildRouteIdPair().
   RunEvents();
   EXPECT_TRUE(prerender_manager()->WasPrerenderCancelled(0, 0));
 
@@ -224,7 +224,7 @@ TEST_F(PrerenderTrackerTest, PrerenderTrackerCancelledFast) {
   EXPECT_TRUE(prerender_tracker()->TryCancel(0, 0, FINAL_STATUS_TIMED_OUT));
 
   // This calls AddPrerenderOnIOThreadTask() and
-  // DestroyPreloadForChildRouteIdPair().
+  // DestroyPrerenderForChildRouteIdPair().
   RunEvents();
   EXPECT_TRUE(prerender_manager()->WasPrerenderCancelled(0, 0));
 
@@ -275,7 +275,7 @@ TEST_F(PrerenderTrackerTest, PrerenderTrackerMultiple) {
   EXPECT_TRUE(prerender_tracker()->TryCancel(1, 2, FINAL_STATUS_HTTPS));
   EXPECT_EQ(FINAL_STATUS_HTTPS, GetCurrentStatus(1, 2));
 
-  // This calls DestroyPreloadForChildRouteIdPair().
+  // This calls DestroyPrerenderForChildRouteIdPair().
   RunEvents();
   EXPECT_FALSE(prerender_manager()->WasPrerenderCancelled(0, 0));
   EXPECT_TRUE(prerender_manager()->WasPrerenderCancelled(1, 2));