Remove the Kasko based out of process browser hang instrumentation.

This CL removes the out-of-process browser hang instrumentation used to
capture 20s hangs and failed rendezvous crash reports in one-off canary
releases. The Kasko reporter is deprecated, and CrashPad does not yet
support the use case.

The plan is to restore this functionality once CrashPad supports it.

BUG=622314

Review-Url: https://codereview.chromium.org/2086403002
Cr-Commit-Position: refs/heads/master@{#402189}

build/common.gypi

@@ -1036,19 +1036,6 @@
           # http://crbug.com/574476
           'fastbuild%': 2,
         }],
-        # Enable hang report capture. Capture can only be enabled for 32bit
-        # Windows.
-        ['OS=="win" and target_arch=="ia32" and branding=="Chrome"', {
-          # Enable hang reports from the watcher process.
-          'kasko_hang_reports%': 0,
-          # Enable failed rendez-vous reports.
-          'kasko_failed_rdv_reports%': 0,
-        }, {
-          # Enable hang reports from the watcher process.
-          'kasko_hang_reports%': 0,
-          # Enable failed rendez-vous reports.
-          'kasko_failed_rdv_reports%': 0,
-        }],
       ],
 
       # Kasko reporting is disabled by default, but may get enabled below.
@@ -1203,8 +1190,6 @@
     'use_sanitizer_options%': '<(use_sanitizer_options)',
     'syzyasan%': '<(syzyasan)',
     'kasko%': '<(kasko)',
-    'kasko_hang_reports%': '<(kasko_hang_reports)',
-    'kasko_failed_rdv_reports%': '<(kasko_failed_rdv_reports)',
     'syzygy_optimize%': '<(syzygy_optimize)',
     'lsan%': '<(lsan)',
     'msan%': '<(msan)',
@@ -2014,14 +1999,8 @@
           }, {
             'win_console_app%': 0,
           }],
-          # Disable hang reporting for syzyasan builds.
+          # Enable the Kasko reporter for syzyasan builds.
           ['syzyasan==1', {
-            # Note: override.
-            'kasko_hang_reports': 0,
-            'kasko_failed_rdv_reports': 0,
-          }],
-          # Enable the Kasko reporter for syzyasan builds and hang reporting.
-          ['syzyasan==1 or kasko_hang_reports==1 or kasko_failed_rdv_reports==1', {
             'kasko': 1,
           }],
           ['component=="shared_library"', {

chrome/browser/BUILD.gn

@@ -8,7 +8,6 @@ import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//media/media_options.gni")
-import("//third_party/kasko/kasko.gni")
 import("//third_party/protobuf/proto_library.gni")
 
 # //build/config/android/rules.gni imports //tools/grit/grit_rule.gni, which
@@ -657,13 +656,6 @@ target(chrome_browser_target_type, "browser") {
       "//components/version_info:generate_version_info",
     ]
   }
-  if (is_win && enable_kasko_failed_rdv_reports) {
-    sources += [
-      "//chrome/app/chrome_crash_reporter_client_win.cc",
-      "//chrome/app/chrome_crash_reporter_client_win.h",
-    ]
-    deps += [ "//components/crash/content/app:lib" ]
-  }
   if (use_nss_certs) {
     sources +=
         rebase_path(gypi_values.chrome_browser_nss_sources, ".", "//chrome")
@@ -844,7 +836,6 @@ target(chrome_browser_target_type, "browser") {
       ":chrome_process_finder",
       "//chrome:file_pre_reader",
       "//chrome/chrome_watcher:client",
-      "//chrome/chrome_watcher:kasko_util",
       "//chrome/common:metrics_constants_util_win",
       "//chrome/common:version_header",
       "//chrome/installer/util:strings",

chrome/browser/process_singleton_win.cc

@@ -13,7 +13,6 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
-#include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/process/process_info.h"
 #include "base/strings/string_number_conversions.h"
@@ -28,27 +27,17 @@
 #include "chrome/browser/chrome_process_finder_win.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/simple_message_box.h"
-#include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/grit/chromium_strings.h"
-#include "chrome/installer/util/google_update_settings.h"
-#include "chrome/installer/util/util_constants.h"
 #include "chrome/installer/util/wmi.h"
-#include "components/version_info/version_info.h"
 #include "content/public/common/result_codes.h"
 #include "net/base/escape.h"
-#include "third_party/kasko/kasko_features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/win/hwnd_util.h"
 
-#if BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
-#include "chrome/app/chrome_crash_reporter_client_win.h"
-#include "chrome/chrome_watcher/kasko_util.h"
-#endif  // BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
-
 namespace {
 
 const char kLockfile[] = "lockfile";
@@ -191,67 +180,6 @@ bool DisplayShouldKillMessageBox() {
          chrome::MESSAGE_BOX_RESULT_NO;
 }
 
-#if BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
-// Capture a failed rendez-vous hang report of the other process. Kasko needs
-// the exception context to live either in the dumper or the dumpee. This
-// means we cannot rely on kasko reporters from either browser watcher, and
-// instead spin up a new reporter.
-void SendFailedRdvReport(const base::Process& process, DWORD thread_id) {
-  // Check whether reports can be uploaded. This involves checking group policy,
-  // stats collection consent and whether running on a bot. The correct approach
-  // would be to rely on crash_reporter::GetUploadsEnabled(). However, on
-  // Windows, the crash client is only expected to be linked into chrome.exe
-  // (not the dlls). That means CrashPad globals are not set and we cannot call
-  // crash_reporter::GetUploadsEnabled(). As a temporary measure until Kasko is
-  // no longer used, we duplicate CrashPad's logic here.
-  ChromeCrashReporterClient crash_reporter_client;
-
-  bool enable_uploads = false;
-  if (!crash_reporter_client.ReportingIsEnforcedByPolicy(&enable_uploads)) {
-    // Breakpad provided a --disable-breakpad switch to disable crash dumping
-    // (not just uploading) here. Crashpad doesn't need it: dumping is enabled
-    // unconditionally and uploading is gated on consent, which tests/bots
-    // shouldn't have. As a precaution, uploading is also disabled on bots
-    // even if consent is present.
-    enable_uploads = crash_reporter_client.GetCollectStatsConsent() &&
-                     !crash_reporter_client.IsRunningUnattended();
-  }
-
-  if (!enable_uploads)
-    return;
-
-  // TODO(manzagop): add a metric for the number of captured hang reports, for
-  //   comparison with uploaded count?
-
-  // Only report on canary.
-  if (chrome::GetChannel() != version_info::Channel::CANARY) {
-    return;
-  }
-  // TODO(manzagop): add a metric for the number of times this does not match.
-  if (!EnsureTargetProcessValidForCapture(process))
-    return;
-
-  // Initialize a reporter, capture a report and shutdown the reporter.
-  base::FilePath watcher_data_directory;
-  if (PathService::Get(chrome::DIR_WATCHER_DATA, &watcher_data_directory)) {
-    base::string16 endpoint =
-        L"chrome_kasko_rdv_" +
-        base::UintToString16(base::Process::Current().Pid());
-
-    bool launched_kasko = InitializeKaskoReporter(
-        endpoint, watcher_data_directory.value().c_str());
-    if (launched_kasko) {
-      DumpHungProcess(thread_id, installer::kChromeChannelCanary, L"failed-rdv",
-                      process);
-      // We immediately request Kasko shutdown. This may block until the
-      // completion of ongoing background tasks (e.g., upload). If the report is
-      // not uploaded by this reporter, any other Kasko reporter may upload it.
-      ShutdownKaskoReporter();
-    }
-  }
-}
-#endif  // BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
-
 }  // namespace
 
 // Microsoft's Softricity virtualization breaks the sandbox processes.
@@ -333,14 +261,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
   // Get a handle to the process that created the window.
   base::Process process = base::Process::Open(process_id);
 
-  // Optionally send a failed rendez-vous report.
-  // Note: we nominate the thread that created the window as the root of the
-  // search for a hung thread.
-#if defined(GOOGLE_CHROME_BUILD)
-#if BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
-  SendFailedRdvReport(process, thread_id);
-#endif  // BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
-#endif  // GOOGLE_CHROME_BUILD
+  // TODO(manzagop): capture a hang report.
 
   // Scan for every window to find a visible one.
   bool visible_window = false;

chrome/chrome_browser.gypi

@@ -3730,15 +3730,6 @@
             '../components/components.gyp:generate_version_info',
           ],
         }],
-        ['OS == "win" and kasko_failed_rdv_reports == 1', {
-          'sources': [
-            'app/chrome_crash_reporter_client_win.cc',
-            'app/chrome_crash_reporter_client_win.h',
-          ],
-          'dependencies': [
-            '../components/components.gyp:crash_component_lib',
-          ],
-        }],
         ['use_nss_certs==1', {
           'sources': [ '<@(chrome_browser_nss_sources)' ],
           'conditions': [
@@ -3905,7 +3896,6 @@
             'chrome_watcher_client',
             'file_pre_reader',
             'installer_util_strings',
-            'kasko_util',
             'metrics_constants_util_win',
             '../chrome/common_constants.gyp:version_header',
             '../chrome_elf/chrome_elf.gyp:chrome_elf',

chrome/chrome_watcher/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//chrome/version.gni")
 import("//testing/test.gni")
-import("//third_party/kasko/kasko.gni")
 
 source_set("client") {
   sources = [
@@ -16,42 +15,36 @@ source_set("client") {
   ]
 }
 
-if (enable_kasko) {
-  source_set("kasko_util") {
-    sources = [
-      "kasko_util.cc",
-      "kasko_util.h",
-      "system_load_estimator.cc",
-      "system_load_estimator.h",
-    ]
-    deps = [
-      "//base",
-      "//components/crash/content/app",
-      "//components/memory_pressure",
-      "//third_party/kasko",
-    ]
-    libs = [ "pdh.lib" ]  # Used by system_load_estimator.h.
-    ldflags = [ "/DELAYLOAD:pdh.dll" ]  # Only used on report capture.
-  }
+source_set("hang_util") {
+  sources = [
+    "system_load_estimator.cc",
+    "system_load_estimator.h",
+  ]
+  deps = [
+    "//base",
+    "//components/memory_pressure",
+  ]
+  libs = [ "pdh.lib" ]  # Used by system_load_estimator.h.
+  ldflags = [ "/DELAYLOAD:pdh.dll" ]  # Only used on report capture.
+}
+
+test("system_load_estimator_unittests") {
+  sources = [
+    "system_load_estimator_unittest.cc",
+  ]
+  deps = [
+    ":client",
+    ":hang_util",
+    "//base/test:run_all_unittests",
+    "//base/test:test_support",
+    "//testing/gtest",
+  ]
+}
 
-  test("system_load_estimator_unittests") {
-    sources = [
-      "system_load_estimator_unittest.cc",
-    ]
-    deps = [
-      ":client",
-      ":kasko_util",
-      "//base/test:run_all_unittests",
-      "//base/test:test_support",
-      "//testing/gtest",
-    ]
-  }
-} else {
-  group("kasko_util") {
-    public_deps = [
-      "//third_party/kasko:kasko_features",
-    ]
-  }
+group("kasko_util") {
+  public_deps = [
+    "//third_party/kasko:kasko_features",
+  ]
 }
 
 process_version("chrome_watcher_resources") {

chrome/chrome_watcher/chrome_watcher.gypi

@@ -9,82 +9,64 @@
     '../../build/util/version.gypi',
     '../../build/win_precompile.gypi',
   ],
-  'conditions': [
-    ['kasko==1', {
-      'targets': [
-        {
-          'target_name': 'kasko_util',
-          'type': 'static_library',
-          'sources': [
-            'kasko_util.cc',
-            'kasko_util.h',
-            'system_load_estimator.cc',
-            'system_load_estimator.h',
-          ],
-          'dependencies': [
-            'chrome_watcher_client',
-            '../base/base.gyp:base',
-            '../third_party/kasko/kasko.gyp:kasko',
-            '../components/components.gyp:crash_component',
-            '../components/components.gyp:memory_pressure'
+  'targets': [
+    {
+      'target_name': 'kasko_util',
+      'type': 'none',
+      'dependencies': [
+        '../third_party/kasko/kasko.gyp:kasko_features',
+      ],
+    },
+    {
+      'target_name': 'hang_util',
+      'type': 'static_library',
+      'sources': [
+        'system_load_estimator.cc',
+        'system_load_estimator.h',
+      ],
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../components/components.gyp:memory_pressure'
+      ],
+      'msvs_settings': {
+        'VCLinkerTool': {
+          'DelayLoadDLLs': [
+            'pdh.dll',  # Used by system_load_estimator.h on report capture.
           ],
-          'export_dependent_settings': [
-            '../third_party/kasko/kasko.gyp:kasko',
+          'AdditionalDependencies': [
+            'pdh.lib',
           ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'DelayLoadDLLs': [
-                'pdh.dll',  # Used by system_load_estimator.h on report capture.
-              ],
-              'AdditionalDependencies': [
-                'pdh.lib',
-              ],
-            },
-          },
-          'all_dependent_settings': {
-            'msvs_settings': {
-              'VCLinkerTool': {
-                'DelayLoadDLLs': [
-                  # Used by system_load_estimator.h on report capture.
-                  'pdh.dll',
-                ],
-                'AdditionalDependencies': [
-                  'pdh.lib',
-                ],
-              },
-            },
-          },
         },
-
-        {
-          # GN version: //chrome/chrome_watcher:system_load_estimator_unittests
-          'target_name': 'system_load_estimator_unittests',
-          'type': '<(gtest_target_type)',
-          'sources': [
-            'system_load_estimator_unittest.cc',
-          ],
-          'dependencies': [
-            'kasko_util',
-            '../base/base.gyp:base',
-            '../base/base.gyp:run_all_unittests',
-            '../base/base.gyp:test_support_base',
-            '../testing/gtest.gyp:gtest',
-          ],
+      },
+      'all_dependent_settings': {
+        'msvs_settings': {
+          'VCLinkerTool': {
+            'DelayLoadDLLs': [
+              # Used by system_load_estimator.h on report capture.
+              'pdh.dll',
+            ],
+            'AdditionalDependencies': [
+              'pdh.lib',
+            ],
+          },
         },
+      },
+    },
+    {
+      # GN version: //chrome/chrome_watcher:system_load_estimator_unittests
+      'target_name': 'system_load_estimator_unittests',
+      'type': '<(gtest_target_type)',
+      'sources': [
+        'system_load_estimator_unittest.cc',
       ],
-    }, {  # 'kasko==0'
-      'targets': [
-        {
-          'target_name': 'kasko_util',
-          'type': 'none',
-          'dependencies': [
-            '../third_party/kasko/kasko.gyp:kasko_features',
-          ],
-        },
+      'dependencies': [
+        'hang_util',
+        '../base/base.gyp:base',
+        '../base/base.gyp:run_all_unittests',
+        '../base/base.gyp:test_support_base',
+        '../testing/gtest.gyp:gtest',
       ],
-    }],
-  ],  # 'conditions'
-  'targets': [
+    },
     {
       'target_name': 'chrome_watcher_resources',
       'type': 'none',

chrome/chrome_watcher/chrome_watcher_main.cc

@@ -35,12 +35,10 @@
 #include "base/win/win_util.h"
 
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
-#include "chrome/chrome_watcher/kasko_util.h"
 #include "chrome/installer/util/util_constants.h"
 #include "components/browser_watcher/endsession_watcher_window_win.h"
 #include "components/browser_watcher/exit_code_watcher_win.h"
 #include "components/browser_watcher/window_hang_monitor_win.h"
-#include "third_party/kasko/kasko_features.h"
 
 namespace {
 
@@ -181,16 +179,6 @@ void BrowserMonitor::BrowserExited() {
   }
 }
 
-void OnWindowEvent(
-    base::Process process,
-    const base::Callback<void(const base::Process&)>& on_hung_callback,
-    browser_watcher::WindowHangMonitor::WindowEvent window_event) {
-  if (window_event == browser_watcher::WindowHangMonitor::WINDOW_HUNG &&
-      !on_hung_callback.is_null()) {
-    on_hung_callback.Run(process);
-  }
-}
-
 }  // namespace
 
 // The main entry point to the watcher, declared as extern "C" to avoid name
@@ -215,22 +203,6 @@ extern "C" int WatcherMain(const base::char16* registry_path,
   // chrome.exe in order to report its exit status.
   ::SetProcessShutdownParameters(0x100, SHUTDOWN_NORETRY);
 
-  base::Callback<void(const base::Process&)> on_hung_callback;
-
-#if BUILDFLAG(ENABLE_KASKO)
-  bool launched_kasko = InitializeKaskoReporter(GetKaskoEndpoint(process.Pid()),
-                                                browser_data_directory);
-
-#if BUILDFLAG(ENABLE_KASKO_HANG_REPORTS)
-  // Only activate hang reports for the canary channel.
-  if (launched_kasko &&
-      base::StringPiece16(channel_name) == installer::kChromeChannelCanary) {
-    on_hung_callback = base::Bind(&DumpHungProcess, main_thread_id,
-                                  channel_name, L"hung-process");
-  }
-#endif  // BUILDFLAG(ENABLE_KASKO_HANG_REPORTS)
-#endif  // BUILDFLAG(ENABLE_KASKO)
-
   // Run a UI message loop on the main thread.
   base::PlatformThread::SetName("WatcherMainThread");
   base::MessageLoop msg_loop(base::MessageLoop::TYPE_UI);
@@ -241,22 +213,8 @@ extern "C" int WatcherMain(const base::char16* registry_path,
                              std::move(on_initialized_event))) {
     return 1;
   }
-
-  {
-    // Scoped to force |hang_monitor| destruction before Kasko is shut down.
-    browser_watcher::WindowHangMonitor hang_monitor(
-        base::TimeDelta::FromSeconds(60), base::TimeDelta::FromSeconds(20),
-        base::Bind(&OnWindowEvent, base::Passed(process.Duplicate()),
-                   on_hung_callback));
-    hang_monitor.Initialize(process.Duplicate());
-
-    run_loop.Run();
-  }
-
-#if BUILDFLAG(ENABLE_KASKO)
-  if (launched_kasko)
-    ShutdownKaskoReporter();
-#endif  // BUILDFLAG(ENABLE_KASKO)
+  run_loop.Run();
+  // TODO(manzagop): hang monitoring using WindowHangMonitor.
 
   // Wind logging down.
   logging::LogEventProvider::Uninitialize();

chrome/chrome_watcher/kasko_util.h

-// Copyright 2016 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.
-
-#ifndef CHROME_CHROME_WATCHER_KASKO_UTIL_H_
-#define CHROME_CHROME_WATCHER_KASKO_UTIL_H_
-
-#include <windows.h>
-
-#include "base/process/process.h"
-#include "base/strings/string16.h"
-
-// Initialize a Kasko reporter.
-bool InitializeKaskoReporter(const base::string16& endpoint,
-                             const base::char16* browser_data_directory);
-
-// Shut down a Kasko reporter.
-void ShutdownKaskoReporter();
-
-// Ensure that a process is a valid target for report capture. This is to
-// defend against against races that exist in getting a Process from a window
-// name (potential HWND and process id recycling).
-bool EnsureTargetProcessValidForCapture(const base::Process& process);
-
-// Dumps a process. A crash key will be added to the report, labelling it as a
-// hang report.
-void DumpHungProcess(DWORD main_thread_id, const base::string16& channel,
-                     const base::char16* hang_type,
-                     const base::Process& process);
-
-#endif  // CHROME_CHROME_WATCHER_KASKO_UTIL_H_

third_party/kasko/BUILD.gn

@@ -9,11 +9,7 @@ import("//third_party/kasko/kasko.gni")
 # GYP version: target 'kasko_features' in third_party/kasko/kasko.gyp
 buildflag_header("kasko_features") {
   header = "kasko_features.h"
-  flags = [
-    "ENABLE_KASKO=$enable_kasko",
-    "ENABLE_KASKO_HANG_REPORTS=$enable_kasko_hang_reports",
-    "ENABLE_KASKO_FAILED_RDV_REPORTS=$enable_kasko_failed_rdv_reports",
-  ]
+  flags = [ "ENABLE_KASKO=$enable_kasko" ]
 }
 
 if (enable_kasko) {

third_party/kasko/kasko.gni

@@ -4,17 +4,6 @@
 
 import("//build/config/sanitizers/sanitizers.gni")
 
-declare_args() {
-  # Enable the reporting of browser hangs with Kasko.
-  # TODO(pmonette): ensure hang reporting is disabled for syzyasan builds.
-  enable_kasko_hang_reports = false
-
-  # Enable the reporting of failed browser rendez-vous with Kasko.
-  # TODO(pmonette): ensure hang reporting is disabled for syzyasan builds.
-  enable_kasko_failed_rdv_reports = false
-}
-
 # Enable the Kasko crash reporter. Enabled by default on Syzyasan official
 # build.
-enable_kasko = (is_official_build && is_syzyasan) ||
-               enable_kasko_hang_reports || enable_kasko_failed_rdv_reports
+enable_kasko = is_official_build && is_syzyasan

third_party/kasko/kasko.gyp

@@ -9,8 +9,6 @@
         'buildflag_header_path': 'third_party/kasko/kasko_features.h',
         'buildflag_flags': [
           'ENABLE_KASKO=<(kasko)',
-          'ENABLE_KASKO_HANG_REPORTS=<(kasko_hang_reports)',
-          'ENABLE_KASKO_FAILED_RDV_REPORTS=<(kasko_failed_rdv_reports)',
         ],
       },
     },