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

chrome/browser/service_process/service_process_control_browsertest.cc

 // Copyright (c) 2012 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 "chrome/browser/service_process/service_process_control.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 51 matching lines @@
       const cloud_print::CloudPrintProxyInfo& proxy_info) {
     QuitMessageLoop();
   }
 
   void Disconnect() {
     // This will close the IPC connection.
     ServiceProcessControl::GetInstance()->Disconnect();
   }
 
   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.
     service_process_.Close();
   }
 
   void TearDown() override {
     if (ServiceProcessControl::GetInstance()->IsConnected())
       EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());
 #if defined(OS_MACOSX)
     // ForceServiceProcessShutdown removes the process from launched on Mac.
     ForceServiceProcessShutdown("", 0);
 #endif  // OS_MACOSX
     if (service_process_.IsValid()) {
       int exit_code;
       EXPECT_TRUE(service_process_.WaitForExitWithTimeout(
           TestTimeouts::action_max_timeout(), &exit_code));
       EXPECT_EQ(0, exit_code);
       service_process_.Close();
     }
+
+    InProcessBrowserTest::TearDown();
   }
 
   void ProcessControlLaunched() {
     base::ProcessId service_pid;
     EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
     EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);
 #if defined(OS_WIN)
     service_process_ =
         base::Process::OpenWithAccess(service_pid,
                                       SYNCHRONIZE | PROCESS_QUERY_INFORMATION);
@@ skipping 156 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, HistogramsNoService) {
   ASSERT_FALSE(ServiceProcessControl::GetInstance()->IsConnected());
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(0);
   EXPECT_FALSE(ServiceProcessControl::GetInstance()->GetHistograms(
       base::Bind(&ServiceProcessControlBrowserTest::HistogramsCallback,
                  base::Unretained(this)),
       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.
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(0);
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->GetHistograms(
       base::Bind(&ServiceProcessControlBrowserTest::HistogramsCallback,
                  base::Unretained(this)),
       base::TimeDelta::FromMilliseconds(100)));
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(1);
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->Shutdown());
   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.
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(0);
   // Wait for real callback by providing large timeout value.
   EXPECT_TRUE(ServiceProcessControl::GetInstance()->GetHistograms(
       base::Bind(&ServiceProcessControlBrowserTest::HistogramsCallback,
                 base::Unretained(this)),
       base::TimeDelta::FromHours(1)));
   EXPECT_CALL(*this, MockHistogramsCallback()).Times(1);
   content::RunMessageLoop();
 }