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

chrome/browser/first_run/upgrade_util_win.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.
 
 #include "chrome/browser/first_run/upgrade_util.h"
 
 #include <windows.h>
 #include <psapi.h>
 #include <shellapi.h>
 
@@ skipping 12 matching lines @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/first_run/upgrade_util_win.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/install_static/install_util.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "components/prefs/pref_service.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(GOOGLE_CHROME_BUILD)
 #include "google_update/google_update_idl.h"
 #endif
 
 namespace {
 
 bool GetNewerChromeFile(base::FilePath* path) {
   if (!PathService::Get(base::DIR_EXE, path))
     return false;
   *path = path->Append(installer::kChromeNewExe);
   return true;
 }
 
 bool InvokeGoogleUpdateForRename() {
 #if defined(GOOGLE_CHROME_BUILD)
   base::win::ScopedComPtr<IProcessLauncher> ipl;
   if (!FAILED(ipl.CreateInstance(__uuidof(ProcessLauncherClass)))) {
     ULONG_PTR phandle = NULL;
     DWORD id = GetCurrentProcessId();
-    BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-    if (!FAILED(ipl->LaunchCmdElevated(dist->GetAppGuid().c_str(),
-                                       google_update::kRegRenameCmdField,
-                                       id,
+    if (!FAILED(ipl->LaunchCmdElevated(install_static::GetAppGuid(),
+                                       google_update::kRegRenameCmdField, id,
                                        &phandle))) {
       HANDLE handle = HANDLE(phandle);
       WaitForSingleObject(handle, INFINITE);
       DWORD exit_code;
       ::GetExitCodeProcess(handle, &exit_code);
       ::CloseHandle(handle);
       if (exit_code == installer::RENAME_SUCCESSFUL)
         return true;
     }
   }
@@ skipping 90 matching lines @@
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
   }
   return true;
 }
 
 }  // namespace upgrade_util