Fix chrome frame upgrade from old to new beta. During upgrade process, two ve...

Fix chrome frame upgrade from old to new beta. During upgrade process, two versions of chrome
frame may get loaded in IE at the same time. We have code to fallback to the old version in
case this happens. However a small overight in declaring a local variable twice in different
scopes led to these checks to fail.

BUG=51620
TEST=test upgrade from 5.0.375.125 to 6.0.472.XXX while IE is running and try 'Open in New window' etc.. 


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

[amit, 2010-08-12 20:53:57]

LGTM! Thanks.

On Thu, Aug 12, 2010 at 1:52 PM, <ananta@chromium.org> wrote:

> Reviewers: amit,
>
> Description:
> Fix chrome frame upgrade from old to new beta. During upgrade process, two
> versions of chrome
> frame may get loaded in IE at the same time. We have code to fallback to
> the old
> version in
> case this happens. However a small overight in declaring a local variable
> twice
> in different
> scopes led to these checks to fail.
>
> BUG=51620
> TEST=test upgrade from 5.0.375.125 to 6.0.472.XXX while IE is running and
> try
> 'Open in New window' etc..
>
>
> Please review this at http://codereview.chromium.org/3136009/show
>
> SVN Base: svn://svn.chromium.org/chrome/trunk/src/
>
> Affected files:
>  M     chrome_frame/module_utils.cc
>
>
> Index: chrome_frame/module_utils.cc
> ===================================================================
> --- chrome_frame/module_utils.cc        (revision 55891)
> +++ chrome_frame/module_utils.cc        (working copy)
> @@ -51,7 +51,6 @@
>     // TODO(amit): Remove this in future versions.
>     if (reinterpret_cast<HMODULE>(DefWindowProc) == oldest_module) {
>       WNDCLASSEX wnd_class = {0};
> -      HMODULE oldest_module = NULL;
>       HWND hwnd = CreateWindow(kBeaconWindowClassName, L"temp_window",
>                                WS_POPUP, 0, 0, 0, 0, NULL, NULL, NULL,
> NULL);
>       DCHECK(IsWindow(hwnd));
>
>
>