Added an integration test for kasko hang reports

chrome/chrome_watcher/chrome_watcher_main.cc

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 01e916b20fcc1934ceae913ade2068c07f15d9e9..32b3d76feebd54e1ee9a1f1f631f567d086addaa 100644
--- a/chrome/chrome_watcher/chrome_watcher_main.cc
+++ b/chrome/chrome_watcher/chrome_watcher_main.cc
@@ -353,7 +353,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);
@@ -390,8 +389,11 @@ extern "C" int WatcherMain(const base::char16* registry_path,
           .c_str(),
       &OnCrashReportUpload, nullptr);
 #ifdef 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);
   }
@@ -415,7 +417,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();
   }