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

content/renderer/pepper/plugin_object.cc

 // Copyright (c) 2011 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/renderer/pepper/plugin_object.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 190 matching lines @@
                                         result_converter.exception());
 
   // Convert the array of PP_Var to an array of NPIdentifiers. If any
   // conversions fail, we will set the exception.
   if (!result_converter.has_exception()) {
     if (property_count > 0) {
       *values = static_cast<NPIdentifier*>(
           calloc(property_count, sizeof(NPIdentifier)));
       *count = 0;  // Will be the number of items successfully converted.
       for (uint32_t i = 0; i < property_count; ++i) {
-        if (!((*values)[i] = PPVarToNPIdentifier(properties[i]))) {
+        (*values)[i] = PPVarToNPIdentifier(properties[i]);
+        if (!(*values)[i]) {
           // Throw an exception for the failed convertion.
           *result_converter.exception() =
               StringVar::StringToPPVar(kInvalidValueException);
           break;
         }
         (*count)++;
       }
 
       if (result_converter.has_exception()) {
         // We don't actually have to free the identifiers we converted since
@@ skipping 135 matching lines @@
 }
 
 // static
 NPObject* PluginObject::AllocateObjectWrapper() {
   NPObjectWrapper* wrapper = new NPObjectWrapper;
   memset(wrapper, 0, sizeof(NPObjectWrapper));
   return wrapper;
 }
 
 }  // namespace content