| Index: chrome/app_shim/chrome_main_app_mode_mac.mm
|
| diff --git a/chrome/app_shim/chrome_main_app_mode_mac.mm b/chrome/app_shim/chrome_main_app_mode_mac.mm
|
| index 20b125825da9d4b4203e9a0770d021c26fa0837f..5bc6a5e0ed4cb1e2d7025ad679486f2e480bd994 100644
|
| --- a/chrome/app_shim/chrome_main_app_mode_mac.mm
|
| +++ b/chrome/app_shim/chrome_main_app_mode_mac.mm
|
| @@ -686,20 +686,18 @@ int ChromeAppModeStart_v4(const app_mode::ChromeAppModeInfo* info) {
|
| [ReplyEventHandler pingProcess:psn
|
| andCall:on_ping_chrome_reply];
|
|
|
| - main_message_loop.PostDelayedTask(
|
| - FROM_HERE,
|
| - base::Bind(&AppShimController::OnPingChromeTimeout,
|
| - base::Unretained(&controller)),
|
| + main_message_loop.task_runner()->PostDelayedTask(
|
| + FROM_HERE, base::Bind(&AppShimController::OnPingChromeTimeout,
|
| + base::Unretained(&controller)),
|
| base::TimeDelta::FromSeconds(kPingChromeTimeoutSeconds));
|
| } else {
|
| // Chrome already running. Proceed to init. This could still fail if Chrome
|
| // is still starting up or shutting down, but the process will exit quickly,
|
| // which is preferable to waiting for the Apple Event to timeout after one
|
| // minute.
|
| - main_message_loop.PostTask(
|
| + main_message_loop.task_runner()->PostTask(
|
| FROM_HERE,
|
| - base::Bind(&AppShimController::Init,
|
| - base::Unretained(&controller)));
|
| + base::Bind(&AppShimController::Init, base::Unretained(&controller)));
|
| }
|
|
|
| main_message_loop.Run();
|
|
|