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

chrome/browser/sessions/session_backend.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/sessions/session_backend.h"
 
 #include <limits>
 
 #include "base/file_util.h"
 #include "base/files/file.h"
@@ skipping 81 matching lines @@
   FileHeader header;
   int read_count;
   TimeTicks start_time = TimeTicks::Now();
   read_count = file_->ReadAtCurrentPos(reinterpret_cast<char*>(&header),
                                        sizeof(header));
   if (read_count != sizeof(header) || header.signature != kFileSignature ||
       header.version != kFileCurrentVersion)
     return false;
 
   ScopedVector<SessionCommand> read_commands;
-  SessionCommand* command;
-  while ((command = ReadCommand()) && !errored_)
+  for (SessionCommand* command = ReadCommand(); command && !errored_;
+       command = ReadCommand())
     read_commands.push_back(command);
   if (!errored_)
     read_commands.swap(*commands);
   if (type == BaseSessionService::TAB_RESTORE) {
     UMA_HISTOGRAM_TIMES("TabRestore.read_session_file_time",
                         TimeTicks::Now() - start_time);
   } else {
     UMA_HISTOGRAM_TIMES("SessionRestore.read_session_file_time",
                         TimeTicks::Now() - start_time);
   }
@@ skipping 281 matching lines @@
 }
 
 base::FilePath SessionBackend::GetCurrentSessionPath() {
   base::FilePath path = path_to_dir_;
   if (type_ == BaseSessionService::TAB_RESTORE)
     path = path.AppendASCII(kCurrentTabSessionFileName);
   else
     path = path.AppendASCII(kCurrentSessionFileName);
   return path;
 }