Add options to disable each of the two aspects of the prerender service

chrome/browser/prerender/prerender_local_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/prerender/prerender_local_predictor.h"
 
 #include <ctype.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 624 matching lines @@
             }
           ]
         }
       }
     }
   */
   DictionaryValue json_data;
   DictionaryValue* req = new DictionaryValue();
   req->SetInteger("version", 1);
   req->SetInteger("behavior_id", GetPrerenderServiceBehaviorID());
-  if (info->source_url_.url_lookup_success) {
+  if (ShouldQueryPrerenderServiceForCurrentURL() &&
+      info->source_url_.url_lookup_success) {
     ListValue* browse_history = new ListValue();
     DictionaryValue* browse_item = new DictionaryValue();
     browse_item->SetString("url", info->source_url_.url.spec());
     browse_history->Append(browse_item);
     DictionaryValue* hint_request = new DictionaryValue();
     hint_request->Set("browse_history", browse_history);
     req->Set("hint_request", hint_request);
   }
   int num_candidate_urls = 0;
   for (int i = 0; i < static_cast<int>(info->candidate_urls_.size()); i++) {
     if (info->candidate_urls_[i].url_lookup_success)
       num_candidate_urls++;
   }
-  if (num_candidate_urls > 0) {
+  if (ShouldQueryPrerenderServiceForCandidateURLs() &&
+      num_candidate_urls > 0) {
     ListValue* candidates = new ListValue();
     DictionaryValue* candidate;
     for (int i = 0; i < static_cast<int>(info->candidate_urls_.size()); i++) {
       if (info->candidate_urls_[i].url_lookup_success) {
         candidate = new DictionaryValue();
         candidate->SetString("url", info->candidate_urls_[i].url.spec());
         candidates->Append(candidate);
       }
     }
     DictionaryValue* candidate_check_request = new DictionaryValue();
@@ skipping 80 matching lines @@
     }
   */
   ListValue* list = NULL;
   int int_value;
   if (!dict->GetInteger("prerender_response.behavior_id", &int_value) ||
       int_value != GetPrerenderServiceBehaviorID()) {
     return false;
   }
   if (!dict->GetList("prerender_response.candidate_check_response.candidates",
                      &list)) {
-    if (info->candidate_urls_.size() > 0)
-      return false;
+    if (ShouldQueryPrerenderServiceForCandidateURLs()) {
+      for (int i = 0; i < static_cast<int>(info->candidate_urls_.size()); i++) {

[jam, 2013/09/09 20:22:51]

nit: size_t then you don't need cast...

+        if (info->candidate_urls_[i].url_lookup_success)
+          return false;
+      }
+    }
   } else {
     for (size_t i = 0; i < list->GetSize(); i++) {
       DictionaryValue* d;
       if (!list->GetDictionary(i, &d))
         return false;
       string url_string;
       if (!d->GetString("url", &url_string) || !GURL(url_string).is_valid())
         return false;
       GURL url(url_string);
       int in_index_timed_out = 0;
@@ skipping 12 matching lines @@
       for (size_t j = 0; j < info->candidate_urls_.size(); j++) {
         if (info->candidate_urls_[j].url == url) {
           info->candidate_urls_[j].service_whitelist_reported = true;
           info->candidate_urls_[j].service_whitelist = (in_index == 1);
           info->candidate_urls_[j].service_whitelist_lookup_ok =
               ((1 - in_index_timed_out) == 1);
         }
       }
     }
     for (size_t i = 0; i < info->candidate_urls_.size(); i++) {
-      if (!info->candidate_urls_[i].service_whitelist_reported)
+      if (info->candidate_urls_[i].url_lookup_success &&
+          !info->candidate_urls_[i].service_whitelist_reported) {
         return false;
+      }
     }
   }
 
-  list = NULL;
-  if (dict->GetInteger("prerender_response.hint_response.hinting_timed_out",
-                       &int_value) &&
-      int_value == 1) {
-    *hinting_timed_out = true;
-  } else if (!dict->GetList("prerender_response.hint_response.candidates",
-                            &list)) {
-    return false;
-  } else {
-    for (int i = 0; i < static_cast<int>(list->GetSize()); i++) {
-      DictionaryValue* d;
-      if (!list->GetDictionary(i, &d))
-        return false;
-      string url;
-      double priority;
-      if (!d->GetString("url", &url) || !d->GetDouble("likelihood", &priority)
-          || !GURL(url).is_valid()) {
-        return false;
+  if (ShouldQueryPrerenderServiceForCurrentURL() &&
+      info->source_url_.url_lookup_success) {
+    list = NULL;
+    if (dict->GetInteger("prerender_response.hint_response.hinting_timed_out",
+                         &int_value) &&
+        int_value == 1) {
+      *hinting_timed_out = true;
+    } else if (!dict->GetList("prerender_response.hint_response.candidates",
+                              &list)) {
+      return false;
+    } else {
+      for (int i = 0; i < static_cast<int>(list->GetSize()); i++) {

[jam, 2013/09/09 20:22:51]

ditto

+        DictionaryValue* d;
+        if (!list->GetDictionary(i, &d))
+          return false;
+        string url;
+        double priority;
+        if (!d->GetString("url", &url) || !d->GetDouble("likelihood", &priority)
+            || !GURL(url).is_valid()) {
+          return false;
+        }
+        int in_index_timed_out = 0;
+        int in_index = 0;
+        if ((!d->GetInteger("in_index_timed_out", &in_index_timed_out) ||
+             in_index_timed_out != 1) &&
+            !d->GetInteger("in_index", &in_index)) {
+          return false;
+        }
+        if (priority < 0.0 || priority > 1.0 || in_index < 0 || in_index > 1 ||
+            in_index_timed_out < 0 || in_index_timed_out > 1) {
+          return false;
+        }
+        if (in_index_timed_out == 1)
+          *hinting_url_lookup_timed_out = true;
+        info->MaybeAddCandidateURLFromService(GURL(url),
+                                              priority,
+                                              in_index == 1,
+                                              (1 - in_index_timed_out) == 1);
       }
-      int in_index_timed_out = 0;
-      int in_index = 0;
-      if ((!d->GetInteger("in_index_timed_out", &in_index_timed_out) ||
-           in_index_timed_out != 1) &&
-          !d->GetInteger("in_index", &in_index)) {
-        return false;
-      }
-      if (priority < 0.0 || priority > 1.0 || in_index < 0 || in_index > 1 ||
-          in_index_timed_out < 0 || in_index_timed_out > 1) {
-        return false;
-      }
-      if (in_index_timed_out == 1)
-        *hinting_url_lookup_timed_out = true;
-      info->MaybeAddCandidateURLFromService(GURL(url),
-                                            priority,
-                                            in_index == 1,
-                                            (1 - in_index_timed_out) == 1);
     }
   }
 
   return true;
 }
 
 void PrerenderLocalPredictor::OnURLFetchComplete(
     const net::URLFetcher* source) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   RecordEvent(EVENT_PRERENDER_SERVICE_RECEIVED_RESULT);
@@ skipping 427 matching lines @@
   }
   if (best_matched_prerender) {
     RecordEvent(EVENT_TAB_HELPER_URL_SEEN_MATCH);
     best_matched_prerender->would_have_matched = true;
     if (session_storage_namespace_matches)
       RecordEvent(EVENT_TAB_HELPER_URL_SEEN_NAMESPACE_MATCH);
   }
 }
 
 }  // namespace prerender