Use install_static::GetAppGuid in place of BrowserDistribution and AppRegistrationData.

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 <utility>
 
 #include "base/files/file_path.h"
 #include "base/memory/ptr_util.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/install_static/install_util.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/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"
@@ skipping 104 matching lines @@
   }
 
   if (os_info->version() >= base::win::VERSION_WIN10 &&
       NavigateToUrlWithEdge(url)) {
     return;
   }
   NavigateToUrlWithIExplore(url);
 }
 
 base::string16 GoogleChromeDistribution::GetActiveSetupGuid() {
-  return GetAppGuid();
+  return install_static::GetAppGuid();
 }
 
 base::string16 GoogleChromeDistribution::GetBaseAppName() {
   // I'd really like to return L ## PRODUCT_FULLNAME_STRING; but that's no good
   // since it'd be "Chromium" in a non-Chrome build, which isn't at all what I
   // want.  Sigh.
   return L"Google Chrome";
 }
 
 base::string16 GoogleChromeDistribution::GetShortcutName() {
@@ skipping 35 matching lines @@
   return app_description;
 }
 
 std::string GoogleChromeDistribution::GetSafeBrowsingName() {
   return "googlechrome";
 }
 
 base::string16 GoogleChromeDistribution::GetDistributionData(HKEY root_key) {
   base::string16 sub_key(google_update::kRegPathClientState);
   sub_key.append(L"\\");
-  sub_key.append(GetAppGuid());
+  sub_key.append(install_static::GetAppGuid());
 
   base::win::RegKey client_state_key(
       root_key, sub_key.c_str(), KEY_READ | KEY_WOW64_32KEY);
   base::string16 result;
   base::string16 brand_value;
   if (client_state_key.ReadValue(google_update::kRegRLZBrandField,
                                  &brand_value) == ERROR_SUCCESS) {
     result = google_update::kRegRLZBrandField;
     result.append(L"=");
     result.append(brand_value);
@@ skipping 56 matching lines @@
 // full installer as fall back method in case incremental installer fails.
 // - If incremental installer fails we append a magic string ("-full"), if
 // it is not present already, so that Google Update server next time will send
 // full installer to update Chrome on the local machine
 // - If we are currently running full installer, we remove this magic
 // string (if it is present) regardless of whether installer failed or not.
 // There is no fall-back for full installer :)
 void GoogleChromeDistribution::UpdateInstallStatus(bool system_install,
     installer::ArchiveType archive_type,
     installer::InstallStatus install_status) {
-  GoogleUpdateSettings::UpdateInstallStatus(system_install,
-      archive_type, InstallUtil::GetInstallReturnCode(install_status),
-      GetAppGuid());
+  GoogleUpdateSettings::UpdateInstallStatus(
+      system_install, archive_type,
+      InstallUtil::GetInstallReturnCode(install_status),
+      install_static::GetAppGuid());
 }
 
 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
   return true;
 }
 
 bool GoogleChromeDistribution::HasUserExperiments() {
   return true;
 }