Stop using an atom to store plugin name/version on Windows.

chrome/browser/hang_monitor/hung_plugin_action.cc

 // Copyright (c) 2012 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 <windows.h>
 
 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
 
 #include "base/metrics/histogram.h"
 #include "base/version.h"
@@ skipping 65 matching lines @@
 
   DWORD hung_window_process_id = 0;
   DWORD top_level_window_process_id = 0;
   GetWindowThreadProcessId(hung_window, &hung_window_process_id);
   GetWindowThreadProcessId(top_level_window, &top_level_window_process_id);
 
   *action = HungWindowNotification::HUNG_WINDOW_IGNORE;
   if (top_level_window_process_id != hung_window_process_id) {
     base::string16 plugin_name;
     base::string16 plugin_version;
-    GetPluginNameAndVersion(hung_window,
-                            top_level_window_process_id,
-                            &plugin_name,
-                            &plugin_version);
+
+    content::PluginService::GetInstance()->GetPluginInfoFromWindow(
+        hung_window, &plugin_name, &plugin_version);
     if (plugin_name.empty()) {
       plugin_name = l10n_util::GetStringUTF16(IDS_UNKNOWN_PLUGIN_NAME);
     } else if (kGTalkPluginName == plugin_name) {
       UMA_HISTOGRAM_ENUMERATION("GTalkPlugin.Hung",
           GetGTalkPluginVersion(plugin_version),
           GTALK_PLUGIN_VERSION_MAX + 1);
     }
 
     if (logging::DialogsAreSuppressed()) {
       NOTREACHED() << "Terminated a hung plugin process.";
@@ skipping 53 matching lines @@
     // The message timeout for this window should fallback to the default
     // timeout as this window is now responsive.
     RemoveProp(window, HungWindowDetector::kHungChildWindowTimeout);
     // The monitored plugin recovered. Let's dismiss the message box.
     EnumThreadWindows(GetCurrentThreadId(),
                       reinterpret_cast<WNDENUMPROC>(DismissMessageBox),
                       NULL);
   }
 }
 
-bool HungPluginAction::GetPluginNameAndVersion(HWND plugin_window,
-                                               DWORD browser_process_id,
-                                               base::string16* plugin_name,
-                                               base::string16* plugin_version) {
-  DCHECK(plugin_name);
-  DCHECK(plugin_version);
-  HWND window_to_check = plugin_window;
-  while (NULL != window_to_check) {
-    DWORD process_id = 0;
-    GetWindowThreadProcessId(window_to_check, &process_id);
-    if (process_id == browser_process_id) {
-      // If we have reached a window the that belongs to the browser process
-      // we have gone too far.
-      return false;
-    }
-    if (content::PluginService::GetInstance()->GetPluginInfoFromWindow(
-            window_to_check, plugin_name, plugin_version)) {
-      return true;
-    }
-    window_to_check = GetParent(window_to_check);
-  }
-  return false;
-}
-
 // static
 BOOL CALLBACK HungPluginAction::DismissMessageBox(HWND window, LPARAM ignore) {
   base::string16 class_name = gfx::GetClassName(window);
   // #32770 is the dialog window class which is the window class of
   // the message box being displayed.
   if (class_name == L"#32770") {
     EndDialog(window, IDNO);
     return FALSE;
   }
   return TRUE;
 }
 
 // static
 void CALLBACK HungPluginAction::HungWindowResponseCallback(HWND target_window,
                                                            UINT message,
                                                            ULONG_PTR data,
                                                            LRESULT result) {
   HungPluginAction* instance = reinterpret_cast<HungPluginAction*>(data);
   DCHECK(NULL != instance);
   if (NULL != instance) {
     instance->OnWindowResponsive(target_window);
   }
 }