Speculative resource prefetching - Test fixes.

chrome/browser/predictors/resource_prefetch_predictor.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 "chrome/browser/predictors/resource_prefetch_predictor.h"
 
 #include <map>
 #include <set>
 #include <utility>
 
@@ skipping 308 matching lines @@
 
   CHECK_EQ(response.resource_type, ResourceType::MAIN_FRAME);
   OnMainFrameRedirect(response);
 }
 
 void ResourcePrefetchPredictor::OnMainFrameRequest(
     const URLRequestSummary& request) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(INITIALIZED, initialization_state_);
 
-  // TODO(shishir): Remove this code after verifying that the same navigation is
-  // not seen multiple times.
-  NavigationMap::const_iterator it =
-      inflight_navigations_.find(request.navigation_id);
-  if (it != inflight_navigations_.end()) {
-    DCHECK(it->first.creation_time != request.navigation_id.creation_time);
-  }
-
   // Cleanup older navigations.
   CleanupAbandonedNavigations(request.navigation_id);
 
   // New empty navigation entry.
   inflight_navigations_.insert(std::make_pair(
       request.navigation_id, std::vector<URLRequestSummary>()));
 }
 
 void ResourcePrefetchPredictor::OnMainFrameResponse(
     const URLRequestSummary& response) {
@@ skipping 62 matching lines @@
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   switch (type) {
     case content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME: {
       const content::WebContents* web_contents =
           content::Source<content::WebContents>(source).ptr();
       NavigationID navigation_id(*web_contents);
-      OnNavigationComplete(navigation_id);
+      // WebContents can return an empty URL if the is no navigation entry yet.

[dominich, 2012/07/31 23:08:50]

nit: the -> there

[Shishir, 2012/07/31 23:29:35]

Done.

+      if (!navigation_id.main_frame_url.is_empty())

[dominich, 2012/07/31 23:08:50]

Also, expand the comment to explain 1) when this might be the case and 2) if
this is a problem in terms of not seeing navigations we might be interested in.

[Shishir, 2012/07/31 23:29:35]

Its the way the GetUrl() function call in webcontents is designed. It uses
NavigationController.GetActiveEntry which can be NULL. I have only seen this in
a test so far, but it may occur in production chrome. Appended the same comment
above.

+        OnNavigationComplete(navigation_id);

[dominich, 2012/07/31 23:08:50]

When do we erase this from inflight navigations if we don't call
OnNavigationComplete?

[Shishir, 2012/07/31 23:29:35]

In CleanupOldNavigations.

       break;
     }
 
     case content::NOTIFICATION_LOAD_FROM_MEMORY_CACHE: {
       const content::LoadFromMemoryCacheDetails* load_details =
           content::Details<content::LoadFromMemoryCacheDetails>(details).ptr();
       const content::WebContents* web_contents =
           content::Source<content::NavigationController>(
               source).ptr()->GetWebContents();
 
@@ skipping 332 matching lines @@
                    tables_,
                    urls_to_delete));
 }
 
 void ResourcePrefetchPredictor::SetTablesForTesting(
     scoped_refptr<ResourcePrefetchPredictorTables> tables) {
   tables_ = tables;
 }
 
 }  // namespace predictors