Remove BrowserDistribution::Type.

chrome/installer/util/google_chrome_distribution.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.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <windows.h>
 #include <msi.h>
 #include <shellapi.h>
 
+#include <memory>

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

This include should be in chrome/installer/util/google_chrome_distribution.h
because std::unique_ptr is used here
https://cs.chromium.org/chromium/src/chrome/installer/util/google_chrome_dist...

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

Done.

 #include <utility>
 
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "base/win/windows_version.h"
 #include "chrome/common/chrome_icon_resources_win.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/installer/util/app_registration_data.h"
 #include "chrome/installer/util/channel_info.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
-#include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/uninstall_metrics.h"
 #include "chrome/installer/util/updating_app_registration_data.h"
 #include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/wmi.h"
 #include "third_party/crashpad/crashpad/client/crash_report_database.h"
 #include "third_party/crashpad/crashpad/client/settings.h"
 
@@ skipping 49 matching lines @@
   // The reason we use WMI to launch the process is because the uninstall
   // process runs inside a Job object controlled by the shell. As long as there
   // are processes running, the shell will not close the uninstall applet. WMI
   // allows us to escape from the Job object so the applet will close.
   installer::WMIProcess::Launch(command, &pid);
 }
 
 }  // namespace
 
 GoogleChromeDistribution::GoogleChromeDistribution()
-    : BrowserDistribution(CHROME_BROWSER,
-                          std::unique_ptr<AppRegistrationData>(
-                              new UpdatingAppRegistrationData(kChromeGuid))) {}
+    : BrowserDistribution(std::unique_ptr<AppRegistrationData>(

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

MakeUnique<UpdatingAppRegistrationData>(kChromeGuid)?

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

Done.

+          new UpdatingAppRegistrationData(kChromeGuid))) {}
 
 GoogleChromeDistribution::GoogleChromeDistribution(
     std::unique_ptr<AppRegistrationData> app_reg_data)
-    : BrowserDistribution(CHROME_BROWSER, std::move(app_reg_data)) {}
+    : BrowserDistribution(std::move(app_reg_data)) {}
 
 void GoogleChromeDistribution::DoPostUninstallOperations(
     const base::Version& version,
     const base::FilePath& local_data_path,
     const base::string16& distribution_data) {
   // Send the Chrome version and OS version as params to the form.
   // It would be nice to send the locale, too, but I don't see an
   // easy way to get that in the existing code. It's something we
   // can add later, if needed.
   // We depend on installed_version.GetString() not having spaces or other
@@ skipping 170 matching lines @@
       GetAppGuid());
 }
 
 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
   return true;
 }
 
 bool GoogleChromeDistribution::HasUserExperiments() {
   return true;
 }