summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-09 06:29:09 +0000
committervitalybuka@chromium.org <vitalybuka@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-09 06:29:09 +0000
commit3e865cb64bde966254aef83efa32d9ae9d1558ee (patch)
tree158fb13499d6498f446cacb2f843d1397a2386f8
parente07de01d759e52873c766c07d633e3b8be90d844 (diff)
downloadchromium_src-3e865cb64bde966254aef83efa32d9ae9d1558ee.zip
chromium_src-3e865cb64bde966254aef83efa32d9ae9d1558ee.tar.gz
chromium_src-3e865cb64bde966254aef83efa32d9ae9d1558ee.tar.bz2
Re-enable ServiceProcessControlBrowserTest.LaunchAndIPC
BUG=70076,304715 Review URL: https://codereview.chromium.org/26292005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227683 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/service/service_process_control_browsertest.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc
index 94293f5..37fc004 100644
--- a/chrome/browser/service/service_process_control_browsertest.cc
+++ b/chrome/browser/service/service_process_control_browsertest.cc
@@ -99,11 +99,7 @@ class ServiceProcessControlBrowserTest
base::ProcessHandle service_process_handle_;
};
-// They way that the IPC is implemented only works on windows. This has to
-// change when we implement a different scheme for IPC.
-// Times out flakily, http://crbug.com/70076.
-IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
- DISABLED_LaunchAndIPC) {
+IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, LaunchAndIPC) {
LaunchServiceProcessControl();
// Make sure we are connected to the service process.