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

chrome/renderer/safe_browsing/phishing_dom_feature_extractor.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/renderer/safe_browsing/phishing_dom_feature_extractor.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
@@ skipping 375 matching lines @@
       net::registry_controlled_domains::GetDomainAndRegistry(
           cur_document_.url(),
           net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
 }
 
 blink::WebDocument PhishingDOMFeatureExtractor::GetNextDocument() {
   DCHECK(!cur_document_.isNull());
   blink::WebFrame* frame = cur_document_.frame();
   // Advance to the next frame that contains a document, with no wrapping.
   if (frame) {
-    while ((frame = frame->traverseNext(false))) {
+    for (frame = frame->traverseNext(false); frame;
+         frame = frame->traverseNext(false)) {
       if (!frame->document().isNull()) {
         return frame->document();
       }
     }
   } else {
     // Keep track of how often frame traversal got "stuck" due to the
     // current subdocument getting removed from the frame tree.
     UMA_HISTOGRAM_COUNTS("SBClientPhishing.DOMFeatureFrameRemoved", 1);
   }
   return blink::WebDocument();
@@ skipping 81 matching lines @@
   // Record number of script tags (discretized for numerical stability.)
   if (page_feature_state_->num_script_tags > 1) {
     features_->AddBooleanFeature(features::kPageNumScriptTagsGTOne);
     if (page_feature_state_->num_script_tags > 6) {
       features_->AddBooleanFeature(features::kPageNumScriptTagsGTSix);
     }
   }
 }
 
 }  // namespace safe_browsing