predictors: Add the request priority to the reource_prefetch_predictor DB.

chrome/browser/predictors/resource_prefetch_predictor.cc

 // Copyright 2014 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 <algorithm>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 339 matching lines @@
       return content::RESOURCE_TYPE_FONT_RESOURCE;
   }
   return fallback;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ResourcePrefetchPredictor structs.
 
 ResourcePrefetchPredictor::URLRequestSummary::URLRequestSummary()
     : resource_type(content::RESOURCE_TYPE_LAST_TYPE),
-      was_cached(false) {
-}
+      priority(net::IDLE),
+      was_cached(false) {}
 
 ResourcePrefetchPredictor::URLRequestSummary::URLRequestSummary(
     const URLRequestSummary& other)
-        : navigation_id(other.navigation_id),
-          resource_url(other.resource_url),
-          resource_type(other.resource_type),
-          mime_type(other.mime_type),
-          was_cached(other.was_cached),
-          redirect_url(other.redirect_url) {
-}
+    : navigation_id(other.navigation_id),
+      resource_url(other.resource_url),
+      resource_type(other.resource_type),
+      priority(other.priority),
+      mime_type(other.mime_type),
+      was_cached(other.was_cached),
+      redirect_url(other.redirect_url) {}
 
 ResourcePrefetchPredictor::URLRequestSummary::~URLRequestSummary() {
 }
 
 ResourcePrefetchPredictor::Result::Result(
     PrefetchKeyType i_key_type,
     ResourcePrefetcher::RequestVector* i_requests)
     : key_type(i_key_type),
       requests(i_requests) {
 }
@@ skipping 552 matching lines @@
     for (size_t i = 0; i < new_resources_size; ++i) {
       if (resources_seen.find(new_resources[i].resource_url) !=
           resources_seen.end()) {
         continue;
       }
       ResourceRow row_to_add;
       row_to_add.resource_url = new_resources[i].resource_url;
       row_to_add.resource_type = new_resources[i].resource_type;
       row_to_add.number_of_hits = 1;
       row_to_add.average_position = i + 1;
+      row_to_add.priority = new_resources[i].priority;
       cache_entry->second.resources.push_back(row_to_add);
       resources_seen.insert(new_resources[i].resource_url);
     }
   } else {
     ResourceRows& old_resources = cache_entry->second.resources;
     cache_entry->second.last_visit = base::Time::Now();
 
     // Build indices over the data.
     std::map<GURL, int> new_index, old_index;
     int new_resources_size = static_cast<int>(new_resources.size());
@@ skipping 17 matching lines @@
         ++old_row.number_of_misses;
         ++old_row.consecutive_misses;
       } else {
         const URLRequestSummary& new_row =
             new_resources[new_index[old_row.resource_url]];
 
         // Update the resource type since it could have changed.
         if (new_row.resource_type != content::RESOURCE_TYPE_LAST_TYPE)
           old_row.resource_type = new_row.resource_type;
 
+        old_row.priority = new_row.priority;
+
         int position = new_index[old_row.resource_url] + 1;
         int total = old_row.number_of_hits + old_row.number_of_misses;
         old_row.average_position =
             ((old_row.average_position * total) + position) / (total + 1);
         ++old_row.number_of_hits;
         old_row.consecutive_misses = 0;
       }
     }
 
     // Add the new ones that we have not seen before.
     for (int i = 0; i < new_resources_size; ++i) {
       const URLRequestSummary& summary = new_resources[i];
       if (old_index.find(summary.resource_url) != old_index.end())
         continue;
 
       // Only need to add new stuff.
       ResourceRow row_to_add;
       row_to_add.resource_url = summary.resource_url;
       row_to_add.resource_type = summary.resource_type;
       row_to_add.number_of_hits = 1;
       row_to_add.average_position = i + 1;
+      row_to_add.priority = summary.priority;
       old_resources.push_back(row_to_add);
 
       // To ensure we dont add the same url twice.
       old_index[summary.resource_url] = 0;
     }
   }
 
   // Trim and sort the resources after the update.
   ResourceRows& resources = cache_entry->second.resources;
   for (ResourceRows::iterator it = resources.begin();
@@ skipping 369 matching lines @@
     // HistoryService is already loaded. Continue with Initialization.
     OnHistoryAndCacheLoaded();
     return;
   }
   DCHECK(!history_service_observer_.IsObserving(history_service));
   history_service_observer_.Add(history_service);
   return;
 }
 
 }  // namespace predictors