summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-24 04:31:23 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-24 04:31:23 +0000
commit319a4d4d4d17fa13b4fb2c13aea82f2d0b6bdab9 (patch)
treeec57bb1097a5c437e1cfd1ed8f0a2c91cd2a7cd8 /chrome
parent3f73d1c731e8c3361fbb7bfd6411c44d3d32dc92 (diff)
downloadchromium_src-319a4d4d4d17fa13b4fb2c13aea82f2d0b6bdab9.zip
chromium_src-319a4d4d4d17fa13b4fb2c13aea82f2d0b6bdab9.tar.gz
chromium_src-319a4d4d4d17fa13b4fb2c13aea82f2d0b6bdab9.tar.bz2
Revert 230616 "Disable RealServiceProcessControleBrowserTest.Lau..."
(reverted the change that broke this test in r230630) > Disable RealServiceProcessControleBrowserTest.LaunchAndIPC > > Failing on Mac 10.6 Tests (dbg)(3) > > TBR=vitalybuka@chromium.org > BUG=310943 > > Review URL: https://codereview.chromium.org/39273002 TBR=jackhou@chromium.org Review URL: https://codereview.chromium.org/38783003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230633 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/service/service_process_control_browsertest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc
index 7aa17d3..37fc004 100644
--- a/chrome/browser/service/service_process_control_browsertest.cc
+++ b/chrome/browser/service/service_process_control_browsertest.cc
@@ -99,9 +99,7 @@ class ServiceProcessControlBrowserTest
base::ProcessHandle service_process_handle_;
};
-// Failing on Mac, http://crbug.com/310943
-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.