Hopefully the last of the changes to fix the ChromeFrame InstallFlowTest fail...

chrome_frame/chrome_tab.cc

 // Copyright (c) 2010 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.
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
 // Include without path to make GYP build see it.
 #include "chrome_tab.h"  // NOLINT
 
 #include <atlsecurity.h>
@@ skipping 418 matching lines @@
 // To delete the user agent, set value to NULL.
 // The is_system parameter indicates whether this is a per machine or a per
 // user installation.
 HRESULT SetChromeFrameUA(bool is_system, const wchar_t* value) {
   HRESULT hr = E_FAIL;
   HKEY parent_hive = is_system ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
 
   RegKey ua_key;
   if (ua_key.Create(parent_hive, kPostPlatformUAKey, KEY_READ | KEY_WRITE)) {
     // Make sure that we unregister ChromeFrame UA strings registered previously
-    wchar_t name[MAX_PATH + 1] = {};
-    wchar_t value[MAX_PATH + 1] = {};
+    wchar_t value_name[MAX_PATH + 1] = {};
+    wchar_t value_data[MAX_PATH + 1] = {};
 
     DWORD value_index = 0;
     while (value_index < ua_key.ValueCount()) {
-      DWORD name_size = arraysize(name);
-      DWORD value_size = arraysize(value);
+      DWORD name_size = arraysize(value_name);
+      DWORD value_size = arraysize(value_data);
       DWORD type = 0;
-      LRESULT ret = ::RegEnumValue(ua_key.Handle(), value_index, name,
+      LRESULT ret = ::RegEnumValue(ua_key.Handle(), value_index, value_name,
                                    &name_size, NULL, &type,
-                                   reinterpret_cast<BYTE*>(value),
+                                   reinterpret_cast<BYTE*>(value_data),
                                    &value_size);
       if (ret == ERROR_SUCCESS) {
-        if (StartsWith(name, kChromeFramePrefix, false)) {
-          ua_key.DeleteValue(name);
+        if (StartsWith(value_name, kChromeFramePrefix, false)) {
+          ua_key.DeleteValue(value_name);
         } else {
           ++value_index;
         }
       } else {
         break;
       }
     }
 
     std::wstring chrome_frame_ua_value_name = kChromeFramePrefix;
     chrome_frame_ua_value_name += GetCurrentModuleVersion();
@@ skipping 346 matching lines @@
     sd.GetDacl(&new_dacl);
     new_dacl.AddAllowedAce(token_.GetUser(), GENERIC_WRITE | GENERIC_READ);
     if (AtlSetDacl(object_name.c_str(), SE_REGISTRY_KEY, new_dacl)) {
       result = SetOrDeleteMimeHandlerKey(enable, HKEY_LOCAL_MACHINE);
     }
   }
 
   backup.RestoreSecurity(object_name.c_str());
   return result;
 }