diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 18:24:59 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-03 18:24:59 +0000 |
| commit | 6dd22cb5bc86ecf5e388312e05a365dc276ded12 (patch) | |
| tree | 1c1cd116429e287a0077160bacf1ee7ea397a943 /chrome/browser/service | |
| parent | b456b1072bfd4574520c7d8a83c074a550c9215a (diff) | |
| download | chromium_src-6dd22cb5bc86ecf5e388312e05a365dc276ded12.zip chromium_src-6dd22cb5bc86ecf5e388312e05a365dc276ded12.tar.gz chromium_src-6dd22cb5bc86ecf5e388312e05a365dc276ded12.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/service')
| -rw-r--r-- | chrome/browser/service/service_process_control_browsertest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
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(); |