Handle AddPreload/AddPendingPreload on UI thread.

chrome/browser/prerender/prerender_manager_unittest.cc

 // Copyright (c) 2011 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/memory/scoped_vector.h"
 #include "base/time.h"
 #include "chrome/browser/prerender/prerender_contents.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/test/testing_browser_process.h"
 #include "content/browser/browser_thread.h"
@@ skipping 403 matching lines @@
           FINAL_STATUS_USED);
   EXPECT_TRUE(prerender_manager()->AddSimplePreload(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/");
 
-  prerender_manager()->AddPendingPreload(std::make_pair(child_id, route_id),
-                                        pending_url,
-                                        url);
+  EXPECT_TRUE(
+      prerender_manager()->AddPreload(std::make_pair(child_id, route_id),
+                                      pending_url,
+                                      url));
 
   EXPECT_TRUE(prerender_manager()->IsPendingEntry(pending_url));
   EXPECT_TRUE(prerender_contents->has_started());
   ASSERT_EQ(prerender_contents, prerender_manager()->GetEntry(url));
 }
 
-TEST_F(PrerenderManagerTest, PendingPreloadSkippedTest) {
-  GURL url("http://www.google.com/");
-  DummyPrerenderContents* prerender_contents =
-      prerender_manager()->CreateNextPrerenderContents(
-          url,
-          FINAL_STATUS_TIMED_OUT);
-
-  int child_id;
-  int route_id;
-  ASSERT_TRUE(prerender_contents->GetChildId(&child_id));
-  ASSERT_TRUE(prerender_contents->GetRouteId(&route_id));
-
-  EXPECT_TRUE(prerender_manager()->AddSimplePreload(url));
-  prerender_manager()->AdvanceTime(prerender_manager()->max_prerender_age()
-                                  + base::TimeDelta::FromSeconds(1));
-  // GetEntry will cull old entries which should now include prerender_contents.
-  ASSERT_EQ(NULL, prerender_manager()->GetEntry(url));
-
-  GURL pending_url("http://news.google.com/");
-
-  prerender_manager()->AddPendingPreload(std::make_pair(child_id, route_id),
-                                        pending_url,
-                                        url);
-  EXPECT_FALSE(prerender_manager()->IsPendingEntry(pending_url));
-}
-
 // Ensure that extracting a urlencoded URL in the url= query string component
 // works.
 TEST_F(PrerenderManagerTest, ExtractURLInQueryStringTest) {
   GURL result;
   EXPECT_TRUE(PrerenderManager::MaybeGetQueryStringBasedAliasURL(
       GURL("http://www.google.com/url?sa=t&source=web&cd=1&ved=0CBcQFjAA&url=http%3A%2F%2Fwww.abercrombie.com%2Fwebapp%2Fwcs%2Fstores%2Fservlet%2FStoreLocator%3FcatalogId%3D%26storeId%3D10051%26langId%3D-1&rct=j&q=allinurl%3A%26&ei=KLyUTYGSEdTWiAKUmLCdCQ&usg=AFQjCNF8nJ2MpBFfr1ijO39_f22bcKyccw&sig2=2ymyGpO0unJwU1d4kdCUjQ"),
       &result));
   ASSERT_EQ(GURL("http://www.abercrombie.com/webapp/wcs/stores/servlet/StoreLocator?catalogId=&storeId=10051&langId=-1").spec(), result.spec());
   EXPECT_FALSE(PrerenderManager::MaybeGetQueryStringBasedAliasURL(
       GURL("http://www.google.com/url?sadf=test&blah=blahblahblah"), &result));
@@ skipping 69 matching lines @@
   DummyPrerenderContents* prerender_contents =
       prerender_manager()->CreateNextPrerenderContents(fragment_url,
                                                        FINAL_STATUS_USED);
   EXPECT_TRUE(prerender_manager()->AddSimplePreload(fragment_url));
   EXPECT_TRUE(prerender_contents->has_started());
   ASSERT_EQ(prerender_contents,
             prerender_manager()->GetEntry(other_fragment_url));
 }
 
 }  // namespace prerender