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

Hopefully the last of the changes to fix the ChromeFrame InstallFlowTest failures. Basically
a dumb error caused by having a local variable with the same name as that of the parameter
to a function.

BUG=none
TEST=ChromeFrame InstallFlowTest.
TBR=amit


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=71477

[amit, 2011-01-14 22:47:25]

ok

On Fri, Jan 14, 2011 at 12:06 PM, <ananta@chromium.org> wrote:

> Reviewers: amit,
>
> Description:
> Hopefully the last of the changes to fix the ChromeFrame InstallFlowTest
> failures. Basically
> a dumb error caused by having a local variable with the same name as that
> of the
> parameter
> to a function.
>
> BUG=none
> TEST=ChromeFrame InstallFlowTest.
> TBR=amit
>
>
> Please review this at http://codereview.chromium.org/6303005/
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/chrome_tab.cc
>
>
> Index: chrome_frame/chrome_tab.cc
> ===================================================================
> --- chrome_frame/chrome_tab.cc  (revision 71466)
> +++ chrome_frame/chrome_tab.cc  (working copy)
> @@ -436,21 +436,21 @@
>   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;
>         }
>
>
>