Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: chrome/chrome_watcher/chrome_watcher_main.cc

Issue 1543803005: Added an integration test for kasko hang reports (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Set executable bit for python scripts Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_tab_util.cc ('k') | chrome/chrome_watcher/chrome_watcher_main_api.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_watcher/chrome_watcher_main.cc
diff --git a/chrome/chrome_watcher/chrome_watcher_main.cc b/chrome/chrome_watcher/chrome_watcher_main.cc
index e28de01888ade2841c223e7624ef16656db24249..0650c882e16bdedab2dd991e453bbbbb8ccb5f11 100644
--- a/chrome/chrome_watcher/chrome_watcher_main.cc
+++ b/chrome/chrome_watcher/chrome_watcher_main.cc
@@ -354,7 +354,6 @@ extern "C" int WatcherMain(const base::char16* registry_path,
DWORD main_thread_id,
HANDLE on_initialized_event_handle,
const base::char16* browser_data_directory,
- const base::char16* message_window_name,
const base::char16* channel_name) {
base::Process process(process_handle);
base::win::ScopedHandle on_initialized_event(on_initialized_event_handle);
@@ -391,8 +390,11 @@ extern "C" int WatcherMain(const base::char16* registry_path,
.c_str(),
&OnCrashReportUpload, nullptr);
#if BUILDFLAG(ENABLE_KASKO_HANG_REPORTS)
+ // Only activate hang reports for the canary channel. For testing purposes,
+ // Chrome instances with no channels will also report hangs.
if (launched_kasko &&
- base::StringPiece16(channel_name) == installer::kChromeChannelCanary) {
+ (base::StringPiece16(channel_name) == L"" ||
+ base::StringPiece16(channel_name) == installer::kChromeChannelCanary)) {
on_hung_callback =
base::Bind(&DumpHungBrowserProcess, main_thread_id, channel_name);
}
@@ -416,7 +418,7 @@ extern "C" int WatcherMain(const base::char16* registry_path,
base::TimeDelta::FromSeconds(60), base::TimeDelta::FromSeconds(20),
base::Bind(&OnWindowEvent, registry_path,
base::Passed(process.Duplicate()), on_hung_callback));
- hang_monitor.Initialize(process.Duplicate(), message_window_name);
+ hang_monitor.Initialize(process.Duplicate());
run_loop.Run();
}
« no previous file with comments | « chrome/browser/extensions/extension_tab_util.cc ('k') | chrome/chrome_watcher/chrome_watcher_main_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698