Remove multi-install from install_static.

chrome/install_static/install_util.h

 // Copyright 2016 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.
 
 // This file contains helper functions which provide information about the
 // current version of Chrome. This includes channel information, version
 // information etc. This functionality is provided by using functions in
 // kernel32 and advapi32. No other dependencies are allowed in this file.
 
 #ifndef CHROME_INSTALL_STATIC_INSTALL_UTIL_H_
@@ skipping 35 matching lines @@
 extern const wchar_t kProcessType[];
 extern const wchar_t kUserDataDirSwitch[];
 extern const wchar_t kUtilityProcess[];
 
 // Used for suppressing warnings.
 template <typename T> inline void IgnoreUnused(T) {}
 
 // Returns true if Chrome is running at system level.
 bool IsSystemInstall();
 
-// Returns true if current installation of Chrome is a multi-install.
-bool IsMultiInstall();
-
 // Returns true if usage stats collecting is enabled for this user for the
 // current executable.
 bool GetCollectStatsConsent();
 
 // Returns true if the current executable is currently in the chosen sample that
 // will report stats and crashes.
 bool GetCollectStatsInSample();
 
 // Sets the registry value used for checking if Chrome is in the chosen sample
 // that will report stats and crashes. Returns true if writing was successful.
@@ skipping 49 matching lines @@
 // TODO(ananta)
 // http://crbug.com/604923
 // Unify this with the Browser Distribution code.
 void GetExecutableVersionDetails(const std::wstring& exe_path,
                                  std::wstring* product_name,
                                  std::wstring* version,
                                  std::wstring* special_build,
                                  std::wstring* channel_name);
 
 // Gets the channel name for the current Chrome process.
-// If |add_modifier| is true the channel name is returned with the modifier
-// prepended to it. Currently this is only done for multi installs, i.e (-m)
-// is the only modifier supported.
 // TODO(ananta)
 // http://crbug.com/604923
 // Unify this with the Browser Distribution code.
+// TODO(grt): Remove |add_modifier|.

[huangs, 2016/12/27 20:04:22]

FYI Chromium code search shows that GetChromeChannelName() is only used by
install_static. But disregard if there's a deeper reason for the TODO.

[grt (UTC plus 2), 2017/01/02 12:58:45]

TODO->Done!

 std::wstring GetChromeChannelName(bool add_modifier);
 
 // Returns the registry path where the browser crash dumps metrics need to be
 // written to.
 // TODO(ananta)
 // http://crbug.com/604923
 // Unify this with the version in
 // chrome\common\metrics_constants_util_win.cc
 std::wstring GetBrowserCrashDumpAttemptsRegistryPath();
 
@@ skipping 33 matching lines @@
                                            const std::wstring& switch_name);
 
 // Ensures that the given |full_path| exists, and that the tail component is a
 // directory. If the directory does not already exist, it will be created.
 // Returns false if the final component exists but is not a directory, or on
 // failure to create a directory.
 bool RecursiveDirectoryCreate(const std::wstring& full_path);
 
 // Returns the unadorned channel name based on the channel strategy for the
 // install mode.
-std::wstring DetermineChannel(const InstallConstants& mode,
-                              bool system_level,
-                              bool multi_install);
+std::wstring DetermineChannel(const InstallConstants& mode, bool system_level);
 
 // Caches the |ProcessType| of the current process.
 extern ProcessType g_process_type;
 
 }  // namespace install_static
 
 #endif  // CHROME_INSTALL_STATIC_INSTALL_UTIL_H_