Added page score to the ntp suggestions tab.

chrome/browser/history/history_backend.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/history/history_backend.h"
 
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 91 matching lines @@
   } else {
     mv.redirects = redirects;
     if (mv.redirects[mv.redirects.size() - 1] != mv.url) {
       // The last url must be the target url.
       mv.redirects.push_back(mv.url);
     }
   }
   return mv;
 }
 
+// Converts from PageUsageData to FilteredURL.
+FilteredURL MakeFilteredURL(const PageUsageData& page_data) {

[GeorgeY, 2012/04/19 01:16:24]

May be add an explicit constructor 
explicit FilteredURL(const PageUsageData& page_data)
instead? What do you think?

[Rune Fevang, 2012/04/25 00:52:45]

Done.

+  FilteredURL filtered_url;
+  filtered_url.url = page_data.GetURL();
+  filtered_url.title = page_data.GetTitle();
+  filtered_url.score = page_data.GetScore();
+  return filtered_url;
+}
+
 // This task is run on a timer so that commits happen at regular intervals
 // so they are batched together. The important thing about this class is that
 // it supports canceling of the task so the reference to the backend will be
 // freed. The problem is that when history is shutting down, there is likely
 // to be one of these commits still pending and holding a reference.
 //
 // The backend can call Cancel to have this task release the reference. The
 // task will still run (if we ever get to processing the event before
 // shutdown), but it will not do anything.
 //
@@ skipping 1300 matching lines @@
     request->ForwardResult(request->handle(), MostVisitedURLList());
     return;
   }
 
   MostVisitedURLList* result = &request->value;
   QueryMostVisitedURLsImpl(result_count, days_back, result);
   request->ForwardResult(request->handle(), *result);
 }
 
 void HistoryBackend::QueryFilteredURLs(
-      scoped_refptr<QueryMostVisitedURLsRequest> request,
+      scoped_refptr<QueryFilteredURLsRequest> request,
       int result_count,
       const history::VisitFilter& filter)  {
   if (request->canceled())
     return;
 
   base::Time request_start = base::Time::Now();
 
   if (!db_.get()) {
     // No History Database - return an empty list.
-    request->ForwardResult(request->handle(), MostVisitedURLList());
+    request->ForwardResult(request->handle(),FilteredURLList());
     return;
   }
 
   VisitVector visits;
   db_->GetVisibleVisitsDuringTimes(filter, 0, &visits);
 
   std::map<VisitID, std::pair<VisitID, URLID> > segment_ids;
   for (size_t i = 0; i < visits.size(); ++i) {
     segment_ids[visits[i].visit_id] =
         std::make_pair(visits[i].referring_visit, visits[i].segment_id);
@@ skipping 69 matching lines @@
   // Get URL data.
   for (size_t i = 0; i < data.size(); ++i) {
     URLID url_id = db_->GetSegmentRepresentationURL(data[i]->GetID());
     URLRow info;
     if (db_->GetURLRow(url_id, &info)) {
       data[i]->SetURL(info.url());
       data[i]->SetTitle(info.title());
     }
   }
 
-  MostVisitedURLList& result = request->value;
+  FilteredURLList& result = request->value;
   for (size_t i = 0; i < data.size(); ++i) {
     PageUsageData* current_data = data[i];
-    RedirectList redirects;
-    GetMostRecentRedirectsFrom(current_data->GetURL(), &redirects);
-    MostVisitedURL url = MakeMostVisitedURL(*current_data, redirects);
+    FilteredURL url = MakeFilteredURL(*current_data);
     result.push_back(url);
   }
 
   int delta_time = std::max(1, std::min(999,
       static_cast<int>((base::Time::Now() - request_start).InMilliseconds())));
   STATIC_HISTOGRAM_POINTER_BLOCK(
       "NewTabPage.SuggestedSitesLoadTime",
       Add(delta_time),
       base::LinearHistogram::FactoryGet("NewTabPage.SuggestedSitesLoadTime",
           1, 1000, 100, base::Histogram::kUmaTargetedHistogramFlag));
@@ skipping 923 matching lines @@
     return false;
 
   favicon->expired = (Time::Now() - last_updated) >
       TimeDelta::FromDays(kFaviconRefetchDays);
   favicon->known_icon = true;
   favicon->image_data = data;
   return true;
 }
 
 }  // namespace history