From 6dd22cb5bc86ecf5e388312e05a365dc276ded12 Mon Sep 17 00:00:00 2001 From: "hclam@chromium.org" Date: Fri, 3 Sep 2010 18:24:59 +0000 Subject: Enable ServiceProcessControlTest.LaunchTwice Quit the message loop by posting a quit task instead of calling quit directly. BUG= TEST= Review URL: http://codereview.chromium.org/3342012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58510 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/service/service_process_control_browsertest.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'chrome/browser/service') diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc index 8f63113..854a7ab 100644 --- a/chrome/browser/service/service_process_control_browsertest.cc +++ b/chrome/browser/service/service_process_control_browsertest.cc @@ -38,12 +38,14 @@ class ServiceProcessControlBrowserTest void ProcessControlLaunched() { process()->SetMessageHandler(this); // Quit the current message. - MessageLoop::current()->Quit(); + MessageLoop::current()->PostTask(FROM_HERE, + new MessageLoop::QuitTask()); } // ServiceProcessControl::MessageHandler implementations. virtual void OnGoodDay() { - MessageLoop::current()->Quit(); + MessageLoop::current()->PostTask(FROM_HERE, + new MessageLoop::QuitTask()); } ServiceProcessControl* process() { return process_; } @@ -68,7 +70,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, LaunchAndIPC) { // This tests the case when a service process is launched when browser // starts but we try to launch it again in the remoting setup dialog. -IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, DISABLED_LaunchTwice) { +IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, LaunchTwice) { // Launch the service process the first time. LaunchServiceProcessControl(); -- cgit v1.1