Call ::SetUp() and ::TearDown() of base class

chrome/browser/service_process/service_process_control_browsertest.cc

Index: chrome/browser/service_process/service_process_control_browsertest.cc
diff --git a/chrome/browser/service_process/service_process_control_browsertest.cc b/chrome/browser/service_process/service_process_control_browsertest.cc
index 6aeff1b5bc61410b1e53028cbc1ba337369c2036..b4bd874e909f906e23fa07587614aca052cec6aa 100644
--- a/chrome/browser/service_process/service_process_control_browsertest.cc
+++ b/chrome/browser/service_process/service_process_control_browsertest.cc
@@ -69,6 +69,8 @@ class ServiceProcessControlBrowserTest
   }
 
   void SetUp() override {
+    InProcessBrowserTest::SetUp();
+
     // This should not be needed because TearDown() ends with a closed
     // service_process_, but HistogramsTimeout and Histograms fail without this
     // on Mac.
@@ -89,6 +91,8 @@ class ServiceProcessControlBrowserTest
       EXPECT_EQ(0, exit_code);
       service_process_.Close();
     }
+
+    InProcessBrowserTest::TearDown();
   }
 
   void ProcessControlLaunched() {
@@ -265,7 +269,16 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, HistogramsNoService) {
       base::TimeDelta()));
 }
 
-IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, HistogramsTimeout) {
+// Histograms disabled on OSX http://crbug.com/406227
+#if defined(OS_MACOSX)
+#define MAYBE_HistogramsTimeout DISABLED_HistogramsTimeout
+#define MAYBE_Histograms DISABLED_Histograms
+#else
+#define MAYBE_HistogramsTimeout HistogramsTimeout
+#define MAYBE_Histograms Histograms
+#endif
+IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
+                       MAYBE_HistogramsTimeout) {
   LaunchServiceProcessControl();
   ASSERT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
   // Callback should not be called during GetHistograms call.
@@ -279,7 +292,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, HistogramsTimeout) {
   content::RunMessageLoop();
 }
 
-IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, Histograms) {
+IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, MAYBE_Histograms) {
   LaunchServiceProcessControl();
   ASSERT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
   // Callback should not be called during GetHistograms call.