Mike's change.

chrome/installer/gcapi/gcapi_reactivation.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/installer/gcapi/gcapi_reactivation.h"
 
 #include "base/time.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
+#include "chrome/installer/gcapi/gcapi.h"
 
 using base::Time;
 using base::win::RegKey;
 
 namespace {
 const wchar_t kReactivationHistoryKey[] = L"reactivation";
 
 std::wstring GetReactivationHistoryKeyPath() {
   std::wstring reactivation_path(google_update::kRegPathClientState);
   reactivation_path += L"\\";
@@ skipping 17 matching lines @@
       if (reactivation_key.HasValue(brand_iter->c_str())) {
         success = true;
         break;
       }
     }
   }
 
   return success;
 }
 
-bool SetReactivationBrandCode(const std::wstring& brand_code) {
+bool SetReactivationBrandCode(const std::wstring& brand_code, int shell_mode) {
   bool success = false;
 
+  // This function currently only should be run in a non-elevated shell,
+  // so we return "true" if it is being invoked from an elevated shell.
+  if (shell_mode == GCAPI_INVOKED_UAC_ELEVATION) {
+    return true;
+  }

[Roger Tawa OOO till Jul 10th, 2012/02/24 21:46:59]

no need for { and }

[robertshield, 2012/02/24 22:21:40]

Done.

+
   std::wstring path(google_update::kRegPathClientState);
   path += L"\\";
   path += google_update::kChromeUpgradeCode;
 
   RegKey client_state_key(HKEY_CURRENT_USER, path.c_str(), KEY_SET_VALUE);
   if (client_state_key.Valid()) {
     success = client_state_key.WriteValue(
         google_update::kRegRLZReactivationBrandField,
         brand_code.c_str()) == ERROR_SUCCESS;
   }
 
   if (success) {
     // Store this brand code in the reactivation history. Store it with a
     // a currently un-used timestamp for future proofing.
     RegKey reactivation_key(HKEY_CURRENT_USER,
                             GetReactivationHistoryKeyPath().c_str(),
                             KEY_WRITE);
     if (reactivation_key.Valid()) {
       int64 timestamp = Time::Now().ToInternalValue();
       reactivation_key.WriteValue(brand_code.c_str(),
                                   &timestamp,
                                   sizeof(timestamp),
                                   REG_QWORD);
     }
   }
 
   return success;
 }