Added an integration test for kasko hang reports

chrome/chrome_watcher/chrome_watcher_main.cc

 // Copyright (c) 2014 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 <sddl.h>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 335 matching lines @@
 
 }  // namespace
 
 // The main entry point to the watcher, declared as extern "C" to avoid name
 // mangling.
 extern "C" int WatcherMain(const base::char16* registry_path,
                            HANDLE process_handle,
                            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);
 
   // The exit manager is in charge of calling the dtors of singletons.
   base::AtExitManager exit_manager;
   // Initialize the commandline singleton from the environment.
   base::CommandLine::Init(0, nullptr);
 
   logging::LogEventProvider::Initialize(kChromeWatcherTraceProviderName);
@@ skipping 16 matching lines @@
       crash_reports_base_dir
           .Append(L"Crash Reports")
           .value()
           .c_str(),
       crash_reports_base_dir
           .Append(kPermanentlyFailedReportsSubdir)
           .value()
           .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);
   }
 #endif  // KASKO_HANG_REPORTS
 #endif  // KASKO
 
   // Run a UI message loop on the main thread.
   base::MessageLoop msg_loop(base::MessageLoop::TYPE_UI);
   msg_loop.set_thread_name("WatcherMainThread");
 
   base::RunLoop run_loop;
   BrowserMonitor monitor(&run_loop, registry_path);
   if (!monitor.StartWatching(registry_path, process.Duplicate(),
                              on_initialized_event.Pass())) {
     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, 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();
   }
 
 #ifdef KASKO
   if (launched_kasko)
     kasko::api::ShutdownReporter();
 #endif  // KASKO
 
   // Wind logging down.
   logging::LogEventProvider::Uninitialize();
 
   return 0;
 }
 
 static_assert(
     base::is_same<decltype(&WatcherMain), ChromeWatcherMainFunction>::value,
     "WatcherMain() has wrong type");