Return a new error code for multi-install updates if Group Policy settings blocking...

chrome/browser/google/google_update.cc

 // 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"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
-#include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #include "chrome/installer/util/browser_distribution.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 "content/browser/browser_thread.h"
 #include "google_update_idl_i.c"
 #include "views/widget/widget.h"
 
 namespace {
 
-// The registry location of the Google Update policies.
-const wchar_t kGUPolicyRegistrySubKey[] =
-    L"SOFTWARE\\Policies\\Google\\Update";
-const wchar_t kGUPolicyGlobalValue[] = L"UpdateDefault";
-const wchar_t kGUPolicyAppValuePrefix[] = L"Update";
-const DWORD kGUPolicyUpdatesDisabled = 0;
-
-// Checks if the updates have been disabled by policy.
-bool IsUpdateDisabledByPolicy(const std::wstring& guid) {
-#if !defined(GOOGLE_CHROME_BUILD)
-  return true;
-#else
-  std::wstring value_name(kGUPolicyAppValuePrefix);
-  value_name.append(guid);
-  DWORD value = 0;
-  base::win::RegKey policy(HKEY_LOCAL_MACHINE,
-                           kGUPolicyRegistrySubKey, KEY_READ);
-  // Per application settings override global setting.
-  if ((policy.ReadValueDW(value_name.c_str(), &value) == ERROR_SUCCESS) ||
-      (policy.ReadValueDW(kGUPolicyGlobalValue, &value) == ERROR_SUCCESS)) {
-    return value == kGUPolicyUpdatesDisabled;
-  }
-  return false;
-#endif  // defined(GOOGLE_CHROME_BUILD)
-}
-
 // Check if the currently running instance can be updated by Google Update.
-// Returns true only if the instance running is a Google Chrome
-// distribution installed in a standard location.
+// Returns GOOGLE_UPDATE_NO_ERROR only if the instance running is a Google
+// Chrome distribution installed in a standard location.
 GoogleUpdateErrorCode CanUpdateCurrentChrome(
     const std::wstring& chrome_exe_path) {
 #if !defined(GOOGLE_CHROME_BUILD)
   return CANNOT_UPGRADE_CHROME_IN_THIS_DIRECTORY;
 #else
   // TODO(tommi): Check if using the default distribution is always the right
   // thing to do.
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::wstring user_exe_path =
       installer::GetChromeInstallPath(false, dist).value();
   std::wstring machine_exe_path =
       installer::GetChromeInstallPath(true, dist).value();
   std::transform(user_exe_path.begin(), user_exe_path.end(),
                  user_exe_path.begin(), tolower);
   std::transform(machine_exe_path.begin(), machine_exe_path.end(),
                  machine_exe_path.begin(), tolower);
   if (chrome_exe_path != user_exe_path &&
       chrome_exe_path != machine_exe_path ) {
     LOG(ERROR) << L"Google Update cannot update Chrome installed in a "
                << L"non-standard location: " << chrome_exe_path.c_str()
                << L". The standard location is: " << user_exe_path.c_str()
                << L" or " << machine_exe_path.c_str() << L".";
     return CANNOT_UPGRADE_CHROME_IN_THIS_DIRECTORY;
   }
 
   std::wstring app_guid = installer::GetAppGuidForUpdates(
       !InstallUtil::IsPerUserInstall(chrome_exe_path.c_str()));
   DCHECK(!app_guid.empty());
 
-  if (IsUpdateDisabledByPolicy(app_guid))
+  if (GoogleUpdateSettings::GetAppUpdatePolicy(app_guid, NULL) ==
+      GoogleUpdateSettings::UPDATES_DISABLED)
     return GOOGLE_UPDATE_DISABLED_BY_POLICY;
 
   return GOOGLE_UPDATE_NO_ERROR;
 #endif
 }
 
 // Creates an instance of a COM Local Server class using either plain vanilla
 // CoCreateInstance, or using the Elevation moniker if running on Vista.
 // hwnd must refer to a foregound window in order to get the UAC prompt
 // showing up in the foreground if running on Vista. It can also be NULL if
@@ skipping 270 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;
 }