predictors: Refactor UpdateData() function.

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 <map>
 #include <set>
 #include <utility>
 
@@ skipping 1187 matching lines @@
 }
 
 void ResourcePrefetchPredictor::OnVisitCountLookup(
     size_t url_visit_count,
     const PageRequestSummary& summary) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   UMA_HISTOGRAM_COUNTS("ResourcePrefetchPredictor.HistoryVisitCountForUrl",
                        url_visit_count);
 
-  // TODO(alexilin): make only one request to DB thread.
-
   if (config_.is_url_learning_enabled) {
     // URL level data - merge only if we already saved the data, or it
     // meets the cutoff requirement.
     const std::string url_spec = summary.main_frame_url.spec();
     bool already_tracking =
         url_table_cache_->find(url_spec) != url_table_cache_->end();
     bool should_track_url =
         already_tracking || (url_visit_count >= config_.min_url_visit_count);
 
     if (should_track_url) {
@@ skipping 160 matching lines @@
   // If the row has no resources, remove it from the cache and delete the
   // entry in the database. Else update the database.
   if (data.resources_size() == 0) {
     data_map->erase(key);
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
         base::Bind(
             &ResourcePrefetchPredictorTables::DeleteSingleResourceDataPoint,
             tables_, key, key_type));
   } else {
-    PrefetchData empty_data;
-    RedirectData empty_redirect_data;
-    bool is_host = key_type == PREFETCH_KEY_TYPE_HOST;
-    const PrefetchData& host_data = is_host ? data : empty_data;
-    const PrefetchData& url_data = is_host ? empty_data : data;
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
-        base::Bind(&ResourcePrefetchPredictorTables::UpdateData, tables_,
-                   url_data, host_data, empty_redirect_data,
-                   empty_redirect_data));
+        base::Bind(&ResourcePrefetchPredictorTables::UpdateResourceData,
+                   tables_, data, key_type));
   }
 
   // Predictor learns about both redirected and non-redirected destinations to
   // estimate whether the endpoint is permanent.
   LearnRedirect(key_before_redirects, key_type, key, max_data_map_size,
                 redirect_map);
 }
 
 void ResourcePrefetchPredictor::LearnRedirect(const std::string& key,
                                               PrefetchKeyType key_type,
@@ skipping 47 matching lines @@
       &data, config_.max_redirect_consecutive_misses);
 
   if (data.redirect_endpoints_size() == 0) {
     redirect_map->erase(cache_entry);
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
         base::Bind(
             &ResourcePrefetchPredictorTables::DeleteSingleRedirectDataPoint,
             tables_, key, key_type));
   } else {
-    RedirectData empty_redirect_data;
-    PrefetchData empty_data;
-    bool is_host = key_type == PREFETCH_KEY_TYPE_HOST;
-    const RedirectData& host_redirect_data =
-        is_host ? data : empty_redirect_data;
-    const RedirectData& url_redirect_data =
-        is_host ? empty_redirect_data : data;
     BrowserThread::PostTask(
         BrowserThread::DB, FROM_HERE,
-        base::Bind(&ResourcePrefetchPredictorTables::UpdateData, tables_,
-                   empty_data, empty_data, url_redirect_data,
-                   host_redirect_data));
+        base::Bind(&ResourcePrefetchPredictorTables::UpdateRedirectData,
+                   tables_, data, key_type));
   }
 }
 
 void ResourcePrefetchPredictor::LearnOrigins(
     const std::string& host,
     const std::map<GURL, OriginRequestSummary>& summaries,
     size_t max_data_map_size,
     OriginDataMap* data_map) {
   if (host.size() > ResourcePrefetchPredictorTables::kMaxStringLength)
     return;
@@ skipping 209 matching lines @@
 TestObserver::~TestObserver() {
   predictor_->SetObserverForTesting(nullptr);
 }
 
 TestObserver::TestObserver(ResourcePrefetchPredictor* predictor)
     : predictor_(predictor) {
   predictor_->SetObserverForTesting(this);
 }
 
 }  // namespace predictors