try turning tests back on

chrome/browser/service/service_process_control_browsertest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/process_util.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/service/service_process_control.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/service_process_util.h"
@@ skipping 90 matching lines @@
   // Make sure we are connected to the service process.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
   SendRequestAndWait();
 
   // And then shutdown the service process.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());
 }
 
 // This tests the case when a service process is launched when the browser
 // starts but we try to launch it again while setting up Cloud Print.
-// Crashes on mac. http://crbug.com/75518
-#if defined(OS_MACOSX)
-#define MAYBE_LaunchTwice DISABLED_LaunchTwice
-#else
-#define MAYBE_LaunchTwice LaunchTwice
-#endif
-IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_LaunchTwice) {
+IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, LaunchTwice) {
   // Launch the service process the first time.
   LaunchServiceProcessControl();
 
   // Make sure we are connected to the service process.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
   SendRequestAndWait();
 
   // Launch the service process again.
   LaunchServiceProcessControl();
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
   SendRequestAndWait();
 
   // And then shutdown the service process.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());
 }
 
 static void DecrementUntilZero(int* count) {
   (*count)--;
   if (!(*count))
     MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 // Invoke multiple Launch calls in succession and ensure that all the tasks
 // get invoked.
-// Crashes on mac. http://crbug.com/75518
-#if defined(OS_MACOSX)
-#define MAYBE_MultipleLaunchTasks DISABLED_MultipleLaunchTasks
-#else
-#define MAYBE_MultipleLaunchTasks MultipleLaunchTasks
-#endif
 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
-                       MAYBE_MultipleLaunchTasks) {
+                       MultipleLaunchTasks) {
   ServiceProcessControl* process = ServiceProcessControl::GetInstance();
   int launch_count = 5;
   for (int i = 0; i < launch_count; i++) {
     // Launch the process asynchronously.
     process->Launch(
         NewRunnableFunction(&DecrementUntilZero, &launch_count),
         new MessageLoop::QuitTask());
   }
   // Then run the message loop to keep things running.
   ui_test_utils::RunMessageLoop();
   EXPECT_EQ(0, launch_count);
   // And then shutdown the service process.
   EXPECT_TRUE(process->Shutdown());
 }
 
 // Make sure using the same task for success and failure tasks works.
-// Crashes on mac. http://crbug.com/75518
-#if defined(OS_MACOSX)
-#define MAYBE_SameLaunchTask DISABLED_SameLaunchTask
-#else
-#define MAYBE_SameLaunchTask SameLaunchTask
-#endif
-IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_SameLaunchTask) {
+IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, SameLaunchTask) {
   ServiceProcessControl* process = ServiceProcessControl::GetInstance();
   int launch_count = 5;
   for (int i = 0; i < launch_count; i++) {
     // Launch the process asynchronously.
     Task * task = NewRunnableFunction(&DecrementUntilZero, &launch_count);
     process->Launch(task, task);
   }
   // Then run the message loop to keep things running.
   ui_test_utils::RunMessageLoop();
   EXPECT_EQ(0, launch_count);
   // And then shutdown the service process.
   EXPECT_TRUE(process->Shutdown());
 }
 
 // Tests whether disconnecting from the service IPC causes the service process
 // to die.
-// Crashes on mac. http://crbug.com/75518
-#if defined(OS_MACOSX)
-#define MAYBE_DieOnDisconnect DISABLED_DieOnDisconnect
-#else
-#define MAYBE_DieOnDisconnect DieOnDisconnect
-#endif
 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
-                       MAYBE_DieOnDisconnect) {
+                       DieOnDisconnect) {
   // Launch the service process.
   LaunchServiceProcessControl();
   // Make sure we are connected to the service process.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
   Disconnect();
   WaitForShutdown();
 }
 
-//http://code.google.com/p/chromium/issues/detail?id=70793
 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
-                       DISABLED_ForceShutdown) {
+                       ForceShutdown) {
   // Launch the service process.
   LaunchServiceProcessControl();
   // Make sure we are connected to the service process.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
   base::ProcessId service_pid;
   EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
   EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
   chrome::VersionInfo version_info;
   ForceServiceProcessShutdown(version_info.Version(), service_pid);
   WaitForShutdown();
 }
 
-// Crashes on mac. http://crbug.com/75518
-#if defined(OS_MACOSX)
-#define MAYBE_CheckPid DISABLED_CheckPid
-#else
-#define MAYBE_CheckPid CheckPid
-#endif
-IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_CheckPid) {
+IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, CheckPid) {
   base::ProcessId service_pid;
   EXPECT_FALSE(GetServiceProcessData(NULL, &service_pid));
   // Launch the service process.
   LaunchServiceProcessControl();
   EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
   EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
   // Disconnect from service process.
   ServiceProcessControl::GetInstance()->Disconnect();
 }
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(ServiceProcessControlBrowserTest);