Cleanup: Remove double semicolons.

cloud_print/service/win/chrome_launcher.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 "cloud_print/service/win/chrome_launcher.h"
 
 #include <stddef.h>
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/process/process.h"
-#include "base/process/process.h"
 #include "base/values.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/scoped_process_information.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/launcher_support/chrome_launcher_support.h"
 #include "cloud_print/common/win/cloud_print_utils.h"
 #include "cloud_print/service/service_constants.h"
@@ skipping 167 matching lines @@
 void ChromeLauncher::Stop() {
   stop_event_.Signal();
   thread_->Join();
   thread_.reset();
 }
 
 void ChromeLauncher::Run() {
   const base::TimeDelta default_time_out = base::TimeDelta::FromSeconds(1);
   const base::TimeDelta max_time_out = base::TimeDelta::FromHours(1);
 
-  for (base::TimeDelta time_out = default_time_out;;

[tfarina, 2015/12/30 20:32:59]

really? Maybe just add a space after the first ';'? To indicate that the
'condition' is empty? Because otherwise, this foor loop is perfectly valid code
and saves a couple of lines.

[Lei Zhang, 2015/12/30 20:59:59]

Meh. For-loops without a condition are harder to read, since most of the time
readers expect a condition. Readers may need to do a double-take to make sure
they read it right. "while (1)" OTOH clearly implies the reader should look for
returns/breaks inside.

-       time_out = std::min(time_out * 2, max_time_out)) {
+  base::TimeDelta time_out = default_time_out;
+  while (1) {
     base::FilePath chrome_path =
         chrome_launcher_support::GetAnyChromePath(false /* is_sxs */);
 
     if (!chrome_path.empty()) {
       base::CommandLine cmd(chrome_path);
       CopyChromeSwitchesFromCurrentProcess(&cmd);
 
       // Required switches.
       cmd.AppendSwitchASCII(switches::kProcessType, switches::kServiceProcess);
       cmd.AppendSwitchPath(switches::kUserDataDir, user_data_);
@@ skipping 31 matching lines @@
       } else {
         LOG(ERROR) << "Error waiting Chrome (" << ::GetLastError() << ").";
       }
       if (base::Time::Now() - started > base::TimeDelta::FromHours(1)) {
         // Reset timeout because process worked long enough.
         time_out = default_time_out;
       }
     }
     if (stop_event_.TimedWait(time_out))
       break;
+
+    time_out = std::min(time_out * 2, max_time_out);
   }
 }
 
 std::string ChromeLauncher::CreateServiceStateFile(
     const std::string& proxy_id,
     const std::vector<std::string>& printers) {
   base::ScopedTempDir temp_user_data;
   if (!temp_user_data.CreateUniqueTempDir()) {
     LOG(ERROR) << "Can't create temp dir.";
     return std::string();
@@ skipping 56 matching lines @@
       LOG(ERROR) << "Chrome launch failed.";
       return std::string();
     }
     if (!json.empty()) {
       // Close chrome because Service State is ready.
       CloseChrome(chrome_process.Pass(), thread_id);
       return json;
     }
   }
 }