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

Unified Diff: chrome/app/main_dll_loader_win.cc

Issue 1543803005: Added an integration test for kasko hang reports (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Better documentation for RunTest() 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
Index: chrome/app/main_dll_loader_win.cc
diff --git a/chrome/app/main_dll_loader_win.cc b/chrome/app/main_dll_loader_win.cc
index a70a6787d1504d0f2ce48b52ae09ce9325ac2f9b..41868520f17f8d53d28af18a944e1d207bc794a4 100644
--- a/chrome/app/main_dll_loader_win.cc
+++ b/chrome/app/main_dll_loader_win.cc
@@ -228,16 +228,6 @@ int MainDllLoader::Launch(HINSTANCE instance) {
return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
}
- base::FilePath default_user_data_directory;
jam 2016/01/26 23:08:35 why is this code removed?
Patrick Monette 2016/01/27 17:52:03 The user data directory was used by the hang watch
- if (!PathService::Get(chrome::DIR_USER_DATA, &default_user_data_directory))
- return chrome::RESULT_CODE_MISSING_DATA;
- // The actual user data directory may differ from the default according to
- // policy and command-line arguments evaluated in the browser process.
- // The hang monitor will simply be disabled if a window with this name is
- // never instantiated by the browser process. Since this should be
- // exceptionally rare it should not impact stability efforts.
- base::string16 message_window_name = default_user_data_directory.value();
-
base::FilePath watcher_data_directory;
if (!PathService::Get(chrome::DIR_WATCHER_DATA, &watcher_data_directory))
return chrome::RESULT_CODE_MISSING_DATA;
@@ -253,11 +243,10 @@ int MainDllLoader::Launch(HINSTANCE instance) {
ChromeWatcherMainFunction watcher_main =
reinterpret_cast<ChromeWatcherMainFunction>(
::GetProcAddress(watcher_dll, kChromeWatcherDLLEntrypoint));
- return watcher_main(chrome::kBrowserExitCodesRegistryPath,
- parent_process.Take(), main_thread_id,
- on_initialized_event.Take(),
- watcher_data_directory.value().c_str(),
- message_window_name.c_str(), channel_name.c_str());
+ return watcher_main(
+ chrome::kBrowserExitCodesRegistryPath, parent_process.Take(),
+ main_thread_id, on_initialized_event.Take(),
+ watcher_data_directory.value().c_str(), channel_name.c_str());
}
// Initialize the sandbox services.

Powered by Google App Engine
This is Rietveld 408576698