PPAPI/NaCl: Make related tests run in 1 fixture

ppapi/tests/test_broker.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 "ppapi/tests/test_broker.h"
 
 #if defined(_MSC_VER)
 #define OS_WIN 1
 #include <windows.h>
 #else
@@ skipping 199 matching lines @@
 
 void TestBroker::RunTests(const std::string& filter) {
   RUN_TEST(Create, filter);
   RUN_TEST(Create, filter);
   RUN_TEST(GetHandleFailure, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(ConnectFailure, filter);
   RUN_TEST_FORCEASYNC_AND_NOT(ConnectAndPipe, filter);
 
   // The following tests require special setup, so only run them if they're
   // explicitly specified by the filter.
-  if (filter.empty())
-    return;
-
-  RUN_TEST(ConnectPermissionDenied, filter);
-  RUN_TEST(ConnectPermissionGranted, filter);
-  RUN_TEST(IsAllowedPermissionDenied, filter);
-  RUN_TEST(IsAllowedPermissionGranted, filter);
+  if (!ShouldRunAllTests(filter)) {
+    RUN_TEST(ConnectPermissionDenied, filter);
+    RUN_TEST(ConnectPermissionGranted, filter);
+    RUN_TEST(IsAllowedPermissionDenied, filter);
+    RUN_TEST(IsAllowedPermissionGranted, filter);
+  }
 }
 
 std::string TestBroker::TestCreate() {
   // Very simplistic test to make sure we can create a broker interface.
   // TODO(raymes): All of the resources created in this file are leaked. Write
   // a C++ wrapper for PPB_Broker_Trusted to avoid these leaks.
   PP_Resource broker = broker_interface_->CreateTrusted(
       instance_->pp_instance());
   ASSERT_TRUE(broker);
 
@@ skipping 94 matching lines @@
 }
 
 std::string TestBroker::TestIsAllowedPermissionGranted() {
   PP_Resource broker = broker_interface_->CreateTrusted(
       instance_->pp_instance());
   ASSERT_TRUE(broker);
   ASSERT_EQ(PP_TRUE, broker_interface_->IsAllowed(broker));
 
   PASS();
 }