Fixes for re-enabling more MSVC level 4 warnings: chrome/browser/ edition

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 821 matching lines @@
       *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++) {
         base::DictionaryValue* d;
         if (!list->GetDictionary(i, &d))
           return false;
         string url;
+        if (!d->GetString("url", &url) || !GURL(url).is_valid()) {

[sky, 2014/07/15 04:22:24]

nit: no {}

[Peter Kasting, 2014/07/15 18:56:07]

Done.

+          return false;
+        }
         double priority;
-        if (!d->GetString("url", &url) || !d->GetDouble("likelihood", &priority)
-            || !GURL(url).is_valid()) {
+        if (!d->GetDouble("likelihood", &priority) || priority < 0.0 ||
+            priority > 1.0) {
           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) {
+        if (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);
+                                              !in_index_timed_out);
       }
       if (list->GetSize() > 0)
         RecordEvent(EVENT_PRERENDER_SERIVCE_RETURNED_HINTING_CANDIDATES);
     }
   }
 
   return true;
 }
 
 void PrerenderLocalPredictor::OnURLFetchComplete(
@@ skipping 539 matching lines @@
       break;
     case content::SessionStorageNamespace::MERGE_RESULT_MERGEABLE:
       RecordEvent(EVENT_NAMESPACE_MISMATCH_MERGE_RESULT_MERGEABLE);
       break;
     default:
       NOTREACHED();
   }
 }
 
 }  // namespace prerender