Re-enable TopSites in PrerenderManager, this time duplicating the invariant

chrome/browser/prerender/prerender_manager.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 "chrome/browser/prerender/prerender_manager.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 155 matching lines @@
   ~PendingContentsData() {}
   GURL url_;
   GURL referrer_;
   Origin origin_;
 };
 
 class PrerenderManager::MostVisitedSites : public NotificationObserver {
  public:
   explicit MostVisitedSites(Profile* profile) :
       profile_(profile) {
-    // If TopSites is already loaded, we will want to use it right away.
-    // Otherwise, wait for three seconds to avoid race conditions.
-    // This is a hack to ensure unit tests don't fail.
-    // See http://crbug.com/94654
-    if (profile && profile->GetTopSitesWithoutCreating()) {
-      Init();
-    } else {
-      timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(3), this,
-                   &prerender::PrerenderManager::MostVisitedSites::Init);
-    }
-  }
-
-  void Init() {
     history::TopSites* top_sites = GetTopSites();
     if (top_sites) {
       registrar_.Add(this, chrome::NOTIFICATION_TOP_SITES_CHANGED,
                      Source<history::TopSites>(top_sites));
     }
 
     UpdateMostVisited();
   }
 
   void UpdateMostVisited() {
@@ skipping 28 matching lines @@
   history::TopSites* GetTopSites() const {
     if (profile_)
       return profile_->GetTopSites();
     return NULL;
   }
 
   CancelableRequestConsumer topsites_consumer_;
   Profile* profile_;
   NotificationRegistrar registrar_;
   std::set<GURL> urls_;
-  base::OneShotTimer<prerender::PrerenderManager::MostVisitedSites> timer_;
 };
 
-bool PrerenderManager::IsTopSite(const GURL& url) const {
-  return most_visited_.get() && most_visited_->IsTopSite(url);
+bool PrerenderManager::IsTopSite(const GURL& url) {
+  if (!most_visited_.get())
+    most_visited_.reset(new MostVisitedSites(profile_));
+  return most_visited_->IsTopSite(url);
 }
 
 PrerenderManager::PrerenderManager(Profile* profile,
                                    PrerenderTracker* prerender_tracker)
     : enabled_(true),
       profile_(profile),
       prerender_tracker_(prerender_tracker),
       prerender_contents_factory_(PrerenderContents::CreateFactory()),
       last_prerender_start_time_(GetCurrentTimeTicks() -
           base::TimeDelta::FromMilliseconds(kMinTimeBetweenPrerendersMs)),
@@ skipping 773 matching lines @@
   DeletePendingDeleteEntries();
 }
 
 void PrerenderManager::RecordFinalStatus(Origin origin,
                                          uint8 experiment_id,
                                          FinalStatus final_status) const {
   histograms_->RecordFinalStatus(origin, experiment_id, final_status);
 }
 
 }  // namespace prerender