| 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 f28d301738abac4b1db94e24a0c969f6c57d6f0d..7362d8720fbcdde5257e932245323d1c32768745 100644
|
| --- a/chrome/app/main_dll_loader_win.cc
|
| +++ b/chrome/app/main_dll_loader_win.cc
|
| @@ -224,16 +224,6 @@ int MainDllLoader::Launch(HINSTANCE instance) {
|
| return chrome::RESULT_CODE_UNSUPPORTED_PARAM;
|
| }
|
|
|
| - base::FilePath default_user_data_directory;
|
| - 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;
|
| @@ -249,11 +239,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.
|
|
|