Reland http://codereview.chromium.org/8477015

ppapi/tests/test_broker.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 "ppapi/tests/test_broker.h"
 
 #if defined(_MSC_VER)
 #define OS_WIN 1
 #include <windows.h>
 #else
@@ skipping 189 matching lines @@
     : TestCase(instance),
       broker_interface_(NULL) {
 }
 
 bool TestBroker::Init() {
   broker_interface_ = static_cast<PPB_BrokerTrusted const*>(
       pp::Module::Get()->GetBrowserInterface(PPB_BROKER_TRUSTED_INTERFACE));
   return !!broker_interface_;
 }
 
-void TestBroker::RunTest() {
-  RUN_TEST(Create);
-  RUN_TEST(GetHandleFailure);
-  RUN_TEST(ConnectFailure);
+void TestBroker::RunTests(const std::string& filter) {
+  RUN_TEST(Create, filter);
+  RUN_TEST(Create, filter);
+  RUN_TEST(GetHandleFailure, filter);
+  RUN_TEST(ConnectFailure, filter);
 #if !defined(OS_WIN)  // This is broken on Windows. See http://crbug.com/103975.
-  RUN_TEST(ConnectAndPipe);
+  RUN_TEST(ConnectAndPipe, filter);
 #endif
 }
 
 std::string TestBroker::TestCreate() {
   // Very simplistic test to make sure we can create a broker interface.
   PP_Resource broker = broker_interface_->CreateTrusted(
       instance_->pp_instance());
   ASSERT_TRUE(broker);
 
   ASSERT_FALSE(broker_interface_->IsBrokerTrusted(0));
@@ skipping 54 matching lines @@
 
   PlatformFile file = IntToPlatformFile(handle);
   ASSERT_TRUE(VerifyMessage(file, sizeof(kHelloMessage), kHelloMessage));
   ASSERT_TRUE(VerifyMessage(file, sizeof(kBrokerUnsandboxed),
                             kBrokerUnsandboxed));
 
   ASSERT_TRUE(ClosePlatformFile(file));
 
   PASS();
 }