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

content/renderer/history_serialization.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 "content/renderer/history_serialization.h"
 
 #include "content/common/page_state_serialization.h"
 #include "content/public/common/page_state.h"
 #include "content/renderer/history_entry.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
@@ skipping 81 matching lines @@
   state->pinch_viewport_scroll_offset = item.pinchViewportScrollOffset();
   state->scroll_offset = item.scrollOffset();
   state->item_sequence_number = item.itemSequenceNumber();
   state->document_sequence_number =
       item.documentSequenceNumber();
   state->page_scale_factor = item.pageScaleFactor();
   ToNullableString16Vector(item.documentState(), &state->document_state);
 
   state->http_body.http_content_type = item.httpContentType();
   const WebHTTPBody& http_body = item.httpBody();
-  if (!(state->http_body.is_null = http_body.isNull())) {
+  state->http_body.is_null = http_body.isNull();
+  if (!state->http_body.is_null) {
     state->http_body.identifier = http_body.identifier();
     state->http_body.elements.resize(http_body.elementCount());
     for (size_t i = 0; i < http_body.elementCount(); ++i) {
       WebHTTPBody::Element element;
       http_body.elementAt(i, element);
       ToExplodedHttpBodyElement(element, &state->http_body.elements[i]);
     }
     state->http_body.contains_passwords = http_body.containsPasswordData();
   }
 }
@@ skipping 81 matching lines @@
   if (!DecodePageState(page_state.ToEncodedData(), &state))
     return scoped_ptr<HistoryEntry>();
 
   scoped_ptr<HistoryEntry> entry(new HistoryEntry());
   RecursivelyGenerateHistoryItem(state.top, entry->root_history_node());
 
   return entry.Pass();
 }
 
 }  // namespace content