Update checks of multi-installs now use the proper app guid....

chrome/browser/google/google_update.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/google/google_update.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 
 #include "base/file_path.h"
 #include "base/message_loop.h"
@@ skipping 212 matching lines @@
           this, &GoogleUpdate::InitiateGoogleUpdateCheck, install_if_newer,
           window, MessageLoop::current()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // GoogleUpdate, private:
 
 bool GoogleUpdate::InitiateGoogleUpdateCheck(bool install_if_newer,
                                              Window* window,
                                              MessageLoop* main_loop) {
-
   FilePath chrome_exe_path;
   if (!PathService::Get(base::DIR_EXE, &chrome_exe_path)) {
     NOTREACHED();
     return false;
   }
   std::wstring chrome_exe = chrome_exe_path.value();
 
   std::transform(chrome_exe.begin(), chrome_exe.end(),
                  chrome_exe.begin(), tolower);
 
   if (!CanUpdateCurrentChrome(chrome_exe)) {
     main_loop->PostTask(FROM_HERE, NewRunnableMethod(this,
         &GoogleUpdate::ReportResults, UPGRADE_ERROR,
         CANNOT_UPGRADE_CHROME_IN_THIS_DIRECTORY));
     return false;
   }
 
   CComObject<GoogleUpdateJobObserver>* job_observer;
   HRESULT hr =
       CComObject<GoogleUpdateJobObserver>::CreateInstance(&job_observer);
   if (hr != S_OK) {
     return ReportFailure(hr, GOOGLE_UPDATE_JOB_SERVER_CREATION_FAILED,
                          main_loop);
   }
 
   ScopedComPtr<IJobObserver> job_holder(job_observer);
 
   ScopedComPtr<IGoogleUpdate> on_demand;
 
+  bool system_level = false;
+
   if (InstallUtil::IsPerUserInstall(chrome_exe.c_str())) {
     hr = on_demand.CreateInstance(CLSID_OnDemandUserAppsClass);
   } else {
     // The Update operation needs Admin privileges for writing
     // to %ProgramFiles%. On Vista we need to elevate before instantiating
     // the updater instance.
     if (!install_if_newer) {
       hr = on_demand.CreateInstance(CLSID_OnDemandMachineAppsClass);
     } else {
       HWND foreground_hwnd = NULL;
       if (window != NULL) {
         foreground_hwnd = window->GetNativeWindow();
       }
 
       hr = CoCreateInstanceAsAdmin(CLSID_OnDemandMachineAppsClass,
           IID_IGoogleUpdate, foreground_hwnd,
           reinterpret_cast<void**>(on_demand.Receive()));
     }
+    system_level = true;
   }
 
   if (hr != S_OK)
     return ReportFailure(hr, GOOGLE_UPDATE_ONDEMAND_CLASS_NOT_FOUND, main_loop);
 
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  std::wstring app_guid = installer::GetAppGuidForUpdates(system_level);
+  DCHECK(!app_guid.empty());
+
   if (!install_if_newer)
-    hr = on_demand->CheckForUpdate(dist->GetAppGuid().c_str(), job_observer);
+    hr = on_demand->CheckForUpdate(app_guid.c_str(), job_observer);
   else
-    hr = on_demand->Update(dist->GetAppGuid().c_str(), job_observer);
+    hr = on_demand->Update(app_guid.c_str(), job_observer);
 
   if (hr != S_OK)
     return ReportFailure(hr, GOOGLE_UPDATE_ONDEMAND_CLASS_REPORTED_ERROR,
                          main_loop);
 
   // We need to spin the message loop while Google Update is running so that it
   // can report back to us through GoogleUpdateJobObserver. This message loop
   // will terminate once Google Update sends us the completion status
   // (success/error). See OnComplete().
   MessageLoop::current()->Run();
@@ skipping 27 matching lines @@
 }
 
 bool GoogleUpdate::ReportFailure(HRESULT hr, GoogleUpdateErrorCode error_code,
                                  MessageLoop* main_loop) {
   NOTREACHED() << "Communication with Google Update failed: " << hr
                << " error: " << error_code;
   main_loop->PostTask(FROM_HERE, NewRunnableMethod(this,
       &GoogleUpdate::ReportResults, UPGRADE_ERROR, error_code));
   return false;
 }