Remove uses of BrowserDistribution::CHROME_BINARIES in installer_util.

chrome/installer/util/helper.h

 // 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.
 //
 // This file contains helper functions used by setup.
 
 #ifndef CHROME_INSTALLER_UTIL_HELPER_H_
 #define CHROME_INSTALLER_UTIL_HELPER_H_
 
-#include <string>
-
 class BrowserDistribution;
 
 namespace base {
 class FilePath;

[huangs, 2017/01/09 21:27:08]

FilePath is returned by value below, so should replace forward-declaration with

#include "base/files/file_path.h"

? Also remove #include in .cc file.

[grt (UTC plus 2), 2017/01/10 08:43:56]

Yes, indeed!

 }
 
 namespace installer {
 
 // This function returns the install path for Chrome depending on whether its
 // system wide install or user specific install.
 // system_install: if true, the function returns system wide location
 //                 (ProgramFiles\Google). Otherwise it returns user specific
 //                 location (Document And Settings\<user>\Local Settings...)
 base::FilePath GetChromeInstallPath(bool system_install,
                                     BrowserDistribution* dist);
 
-// Returns the distribution corresponding to the current process's binaries.
-// In the case of a multi-install product, this will be the CHROME_BINARIES
-// distribution.
-BrowserDistribution* GetBinariesDistribution(bool system_install);
-
-// Returns the app guid under which the current process receives updates from
-// Google Update.
-std::wstring GetAppGuidForUpdates(bool system_install);
-
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_HELPER_H_