Remove BrowserDistribution::Type.

chrome/installer/util/product.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.
 
 #ifndef CHROME_INSTALLER_UTIL_PRODUCT_H_
 #define CHROME_INSTALLER_UTIL_PRODUCT_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "chrome/installer/util/browser_distribution.h"

[fdoray, 2017/01/10 15:07:37]

Can now be forward-declared.

[grt (UTC plus 2), 2017/01/11 08:17:54]

Done.

 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 
 namespace base {
 class CommandLine;
 }
 
 namespace installer {
 
 class ChannelInfo;
@@ skipping 18 matching lines @@
 
   void InitializeFromPreferences(const MasterPreferences& prefs);
 
   void InitializeFromUninstallCommand(
       const base::CommandLine& uninstall_command);
 
   BrowserDistribution* distribution() const {
     return distribution_;
   }
 
-  bool is_type(BrowserDistribution::Type type) const {
-    return distribution_->GetType() == type;
-  }
-
-  bool is_chrome() const {
-    return distribution_->GetType() == BrowserDistribution::CHROME_BROWSER;
-  }
-
   bool HasOption(const std::wstring& option) const {
     return options_.find(option) != options_.end();
   }
 
   // Returns true if the set of options is mutated by this operation.
   bool SetOption(const std::wstring& option, bool set) {
     if (set)
       return options_.insert(option).second;
     else
       return options_.erase(option) != 0;
@@ skipping 37 matching lines @@
   void LaunchUserExperiment(const base::FilePath& setup_path,
                             InstallStatus status,
                             bool system_level) const;
 
  protected:
   enum CacheStateFlags {
     MSI_STATE = 0x01
   };
 
   BrowserDistribution* distribution_;
   std::unique_ptr<ProductOperations> operations_;

[fdoray, 2017/01/10 15:07:37]

const std::unique_ptr<ProductOperations> operations_;

[grt (UTC plus 2), 2017/01/11 08:17:55]

Done.

   std::set<std::wstring> options_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Product);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_PRODUCT_H_