RenderWidgetHostViewWin::ReparentWindow should call RemovePropW if kNativeWindowClassFilterProp i...

content/browser/renderer_host/render_widget_host_view_win.cc

 // Copyright (c) 2011 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.
 
 // Need Win 7 headers for WM_GESTURE and ChangeWindowMessageFilterEx
 // TODO(jschuh): See crbug.com/92941 for longterm fix.
 #undef  WINVER
 #define WINVER _WIN32_WINNT_WIN7
 #undef  _WIN32_WINNT
 #define _WIN32_WINNT _WIN32_WINNT_WIN7
@@ skipping 454 matching lines @@
     if (!g_ChangeWindowMessageFilterEx) {
       g_ChangeWindowMessageFilterEx =
           reinterpret_cast<ChangeWindowMessageFilterExFunction>(
               ::GetProcAddress(::GetModuleHandle(L"user32.dll"),
                                "ChangeWindowMessageFilterEx"));
     }
     // Process-wide message filters required on Vista must be added to:
     // chrome_content_client.cc ChromeContentClient::SandboxPlugin
     g_ChangeWindowMessageFilterEx(parent, WM_MOUSEWHEEL, MSGFLT_ALLOW, NULL);
     g_ChangeWindowMessageFilterEx(parent, WM_GESTURE, MSGFLT_ALLOW, NULL);
-    ::SetPropW(orig_parent, webkit::npapi::kNativeWindowClassFilterProp, NULL);
+    ::RemovePropW(orig_parent, webkit::npapi::kNativeWindowClassFilterProp);
   }
   ::SetParent(window, parent);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       new NotifyPluginProcessHostTask(window, parent));
   return parent;
 }
 
 static BOOL CALLBACK AddChildWindowToVector(HWND hwnd, LPARAM lparam) {
   std::vector<HWND>* vector = reinterpret_cast<std::vector<HWND>*>(lparam);
@@ skipping 1367 matching lines @@
                                                       DWORD ex_style) {
   parent_hwnd_ = parent_hwnd;
   Create(parent_hwnd_, NULL, NULL, WS_POPUP, ex_style);
   MoveWindow(pos.x(), pos.y(), pos.width(), pos.height(), TRUE);
   // To show tooltip on popup window.(e.g. title in <select>)
   // Popups default to showing, which means |DidBecomeSelected()| isn't invoked.
   // Ensure the tooltip is created otherwise tooltips are never shown.
   EnsureTooltip();
   ShowWindow(IsActivatable() ? SW_SHOW : SW_SHOWNA);
 }