Remove Hung plugin detector

chrome/browser/ui/views/frame/browser_view.cc

 // Copyright 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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 445 matching lines @@
       tabstrip_(nullptr),
       toolbar_(nullptr),
       find_bar_host_view_(nullptr),
       infobar_container_(nullptr),
       contents_web_view_(nullptr),
       devtools_web_view_(nullptr),
       contents_container_(nullptr),
       initialized_(false),
       handling_theme_changed_(false),
       in_process_fullscreen_(false),
-#if defined(OS_WIN)
-      // TODO(piman): is this still useful now that windowed plugins are gone?
-      ticker_(0),
-      hung_window_detector_(&hung_plugin_action_),
-#endif
       force_location_bar_focus_(false),
       activate_modal_dialog_factory_(this) {
 }
 
 BrowserView::~BrowserView() {
   // All the tabs should have been destroyed already. If we were closed by the
   // OS with some tabs than the NativeBrowserFrame should have destroyed them.
   DCHECK_EQ(0, browser_->tab_strip_model()->count());
 
   // Immersive mode may need to reparent views before they are removed/deleted.
   immersive_mode_controller_.reset();
 
   browser_->tab_strip_model()->RemoveObserver(this);
 
 #if defined(OS_WIN)
-  // Stop hung plugin monitoring.
-  ticker_.Stop();
-  ticker_.UnregisterTickHandler(&hung_window_detector_);
-
   // Terminate the jumplist (must be called before browser_->profile() is
   // destroyed.
   if (jumplist_.get()) {
     jumplist_->Terminate();
   }
 #endif
 
   // We destroy the download shelf before |browser_| to remove its child
   // download views from the set of download observers (since the observed
   // downloads can be destroyed along with |browser_| and the observer
@@ skipping 1564 matching lines @@
 
   // Stow a pointer to this object onto the window handle so that we can get at
   // it later when all we have is a native view.
   GetWidget()->SetNativeWindowProperty(kBrowserViewKey, this);
 
   // Stow a pointer to the browser's profile onto the window handle so that we
   // can get it later when all we have is a native view.
   GetWidget()->SetNativeWindowProperty(Profile::kProfileKey,
                                        browser_->profile());
 
-  // Start a hung plugin window detector for this browser object (as long as
-  // hang detection is not disabled).
-  if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableHangMonitor)) {
-    InitHangMonitor();
-  }
-
   LoadAccelerators();
 
   contents_web_view_ = new ContentsWebView(browser_->profile());
   contents_web_view_->set_id(VIEW_ID_TAB_CONTAINER);
   contents_web_view_->SetEmbedFullscreenWidgetMode(true);
 
   web_contents_close_handler_.reset(
       new WebContentsCloseHandler(contents_web_view_));
 
   devtools_web_view_ = new views::WebView(browser_->profile());
@@ skipping 363 matching lines @@
     case APPCOMMAND_REDO:
     case APPCOMMAND_SPELL_CHECK:
     default:                          return -1;
   }
 #else
   // App commands are Windows-specific so there's nothing to do here.
   return -1;
 #endif
 }
 
-void BrowserView::InitHangMonitor() {
-#if defined(OS_WIN)
-  PrefService* pref_service = g_browser_process->local_state();
-  if (!pref_service)
-    return;
-
-  int plugin_message_response_timeout =
-      pref_service->GetInteger(prefs::kPluginMessageResponseTimeout);
-  int hung_plugin_detect_freq =
-      pref_service->GetInteger(prefs::kHungPluginDetectFrequency);
-  HWND window = GetWidget()->GetNativeView()->GetHost()->
-      GetAcceleratedWidget();
-  if ((hung_plugin_detect_freq > 0) &&
-      hung_window_detector_.Initialize(window,
-                                       plugin_message_response_timeout)) {
-    ticker_.set_tick_interval(hung_plugin_detect_freq);
-    ticker_.RegisterTickHandler(&hung_window_detector_);
-    ticker_.Start();
-
-    pref_service->SetInteger(prefs::kPluginMessageResponseTimeout,
-                             plugin_message_response_timeout);
-    pref_service->SetInteger(prefs::kHungPluginDetectFrequency,
-                             hung_plugin_detect_freq);
-  }
-#endif
-}
-
 void BrowserView::UpdateAcceleratorMetrics(const ui::Accelerator& accelerator,
                                            int command_id) {
   const ui::KeyboardCode key_code = accelerator.key_code();
   if (command_id == IDC_HELP_PAGE_VIA_KEYBOARD && key_code == ui::VKEY_F1)
     content::RecordAction(UserMetricsAction("ShowHelpTabViaF1"));
 
   if (command_id == IDC_BOOKMARK_PAGE)
     UMA_HISTOGRAM_ENUMERATION("Bookmarks.EntryPoint",
                               BOOKMARK_ENTRY_POINT_ACCELERATOR,
                               BOOKMARK_ENTRY_POINT_LIMIT);
@@ skipping 201 matching lines @@
 }
 
 extensions::ActiveTabPermissionGranter*
 BrowserView::GetActiveTabPermissionGranter() {
   content::WebContents* web_contents = GetActiveWebContents();
   if (!web_contents)
     return nullptr;
   return extensions::TabHelper::FromWebContents(web_contents)
       ->active_tab_permission_granter();
 }