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

content/common/ssl_status_serialization.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 "content/common/ssl_status_serialization.h"
 
 #include "base/logging.h"
 #include "base/pickle.h"
 
 namespace content {
@@ skipping 35 matching lines @@
     // The following are not applicable and are set to the default values.
     *cert_status = 0;
     *security_bits = -1;
     *ssl_connection_status = 0;
     signed_certificate_timestamp_ids->clear();
     return false;
   }
 
   Pickle pickle(state.data(), static_cast<int>(state.size()));
   PickleIterator iter(pickle);
-  bool pickle_read_ok = pickle.ReadInt(&iter, cert_id) &&
-                        pickle.ReadUInt32(&iter, cert_status) &&
-                        pickle.ReadInt(&iter, security_bits) &&
-                        pickle.ReadInt(&iter, ssl_connection_status);
-  if (!pickle_read_ok)
-    return pickle_read_ok;
+  int num_scts_to_read;
+  if (!pickle.ReadInt(&iter, cert_id) ||
+      !pickle.ReadUInt32(&iter, cert_status) ||
+      !pickle.ReadInt(&iter, security_bits) ||
+      !pickle.ReadInt(&iter, ssl_connection_status) ||
+      !pickle.ReadInt(&iter, &num_scts_to_read))
+    return false;
 
-  int num_scts_to_read;
-  pickle_read_ok = pickle.ReadInt(&iter, &num_scts_to_read);
-  int id;
-  uint16 status;
-  for (; pickle_read_ok && num_scts_to_read > 0; --num_scts_to_read) {
-    pickle_read_ok = pickle.ReadInt(&iter, &id) &&
-                     pickle.ReadUInt16(&iter, &status);
-    if (pickle_read_ok) {
-      signed_certificate_timestamp_ids->push_back(
-          SignedCertificateTimestampIDAndStatus(
-              id,
-              static_cast<net::ct::SCTVerifyStatus>(status)));
-    }
+  for (; num_scts_to_read > 0; --num_scts_to_read) {
+    int id;
+    uint16 status;
+    if (!pickle.ReadInt(&iter, &id) ||
+        !pickle.ReadUInt16(&iter, &status))
+      return false;
+    signed_certificate_timestamp_ids->push_back(
+        SignedCertificateTimestampIDAndStatus(
+            id,
+            static_cast<net::ct::SCTVerifyStatus>(status)));
   }
 
-  return pickle_read_ok;
+  return true;
 }
 
 }  // namespace content