Refactor chrome_launcher_support::GetAnyChromePath.

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 "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 180 matching lines @@
   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;;
        time_out = std::min(time_out * 2, max_time_out)) {
-    base::FilePath chrome_path = chrome_launcher_support::GetAnyChromePath();
+    base::FilePath chrome_path =
+        chrome_launcher_support::GetAnyChromePath(false);

[grt (UTC plus 2), 2015/01/09 17:45:28]

(false /* chrome_sxs */);
here and below

[Matt Giuca, 2015/01/12 06:54:26]

Done.

 
     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_);
       cmd.AppendSwitch(switches::kNoServiceAutorun);
 
@@ skipping 39 matching lines @@
 
 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();
   }
 
-  base::FilePath chrome_path = chrome_launcher_support::GetAnyChromePath();
+  base::FilePath chrome_path = chrome_launcher_support::GetAnyChromePath(false);
   if (chrome_path.empty()) {
     LOG(ERROR) << "Can't find Chrome.";
     return std::string();
   }
 
   base::FilePath printers_file = temp_user_data.path().Append(L"printers.json");
 
   base::ListValue printer_list;
   printer_list.AppendStrings(printers);
   std::string printers_json;
@@ skipping 41 matching lines @@
       LOG(ERROR) << "Chrome launch failed.";
       return std::string();
     }
     if (!json.empty()) {
       // Close chrome because Service State is ready.
       CloseChrome(chrome_handle.Get(), thread_id);
       return json;
     }
   }
 }