Refactor chrome_launcher_support::GetAnyChromePath.

chrome/app_installer/win/app_installer_main.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 <windows.h>
 #include <initguid.h>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/i18n/streaming_utf8_validator.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/logging_win.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app_installer/win/app_installer_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/installer/util/util_constants.h"

[grt (UTC plus 2), 2015/01/13 14:10:43]

looks like this is missing:
#include "chrome/installer/launcher_support/chrome_launcher_support.h"

 #include "content/public/common/user_agent.h"
 
 namespace app_installer {
 
 namespace {
 
 // Log provider UUID. Required for logging to Sawbuck.
 // {d82c3b59-bacd-4625-8282-4d570c4dad12}
 DEFINE_GUID(kAppInstallerLogProvider,
             0xd82c3b59,
@@ skipping 80 matching lines @@
   // Parse the data to check it's valid JSON. The download page will just eval
   // it.
   base::JSONReader json_reader;
   scoped_ptr<base::Value> inline_install_data(
       json_reader.ReadToValue(inline_install_json));
   if (!inline_install_data) {
     LOG(ERROR) << json_reader.GetErrorMessage();
     return COULD_NOT_PARSE_INLINE_INSTALL_DATA;
   }
 
-  base::FilePath chrome_path = GetChromeExePath(is_canary);
+  base::FilePath chrome_path =
+      chrome_launcher_support::GetAnyChromePath(is_canary);
   // If none found, show EULA, download, and install Chrome.
   if (chrome_path.empty()) {
     ExitCode get_chrome_result = GetChrome(is_canary, inline_install_json);
     if (get_chrome_result != SUCCESS)
       return get_chrome_result;
 
-    chrome_path = GetChromeExePath(is_canary);
+    chrome_path = chrome_launcher_support::GetAnyChromePath(is_canary);
     if (chrome_path.empty())
       return COULD_NOT_FIND_CHROME;
   }
 
   base::CommandLine cmd(chrome_path);
   cmd.AppendSwitchASCII(kInstallChromeApp, app_id);
   DVLOG(1) << "Install command: " << cmd.GetCommandLineString();
   bool launched = base::LaunchProcess(cmd, base::LaunchOptions()).IsValid();
   DVLOG(1) << "Launch " << (launched ? "success." : "failed.");
 
   return SUCCESS;
 }
 
 }  // namespace app_installer