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

chrome_frame/module_utils.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.
 
 #include "chrome_frame/module_utils.h"
 
 #include <atlbase.h>
 #include "base/logging.h"
 
 const wchar_t kBeaconWindowClassName[] =
@@ skipping 33 matching lines @@
 HMODULE DllRedirector::GetFirstCFModule() {
   WNDCLASSEX wnd_class = {0};
   HMODULE oldest_module = NULL;
   if (GetClassInfoEx(GetModuleHandle(NULL), kBeaconWindowClassName,
                      &wnd_class)) {
     oldest_module = reinterpret_cast<HMODULE>(wnd_class.lpfnWndProc);
     // Handle older versions that store module pointer in a class info.
     // 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));
       if (hwnd) {
         oldest_module = reinterpret_cast<HMODULE>(GetClassLongPtr(hwnd, 0));
         DestroyWindow(hwnd);
       }
     }
   }
   return oldest_module;
@@ skipping 14 matching lines @@
       LOG(ERROR) << "Module Scan: Couldn't get address of "
                  << "DllGetClassObject: "
                  << GetLastError();
     }
   } else {
     LOG(ERROR) << "Module Scan: Could not increment module count: "
                << GetLastError();
   }
   return proc_ptr;
 }