Make test filters play nice

base/test/launcher/test_launcher.h

Index: base/test/launcher/test_launcher.h
diff --git a/base/test/launcher/test_launcher.h b/base/test/launcher/test_launcher.h
index 218d8b627a969a8de32d65c9d1f947ee2af39887..4e15c112003dfc0a002bde5a2c553f9561714382 100644
--- a/base/test/launcher/test_launcher.h
+++ b/base/test/launcher/test_launcher.h
@@ -142,6 +142,8 @@ class TestLauncher {
   // Runs all tests in current iteration. Uses callbacks to communicate success.
   void RunTests();
 
+  void CombineTestFilters();
+
   void RunTestIteration();
 
   // Saves test results summary as JSON if requested from command line.
@@ -181,7 +183,12 @@ class TestLauncher {
   int cycles_;  // Number of remaining test itreations, or -1 for infinite.
 
   // Test filters (empty means no filter).
+  bool has_positive_filter;

[Paweł Hajdan Jr., 2016/11/30 12:41:32]

nit: All member variables should end with "_".

By the way, do we really need this variable?

[katthomas, 2016/12/01 00:07:01]

We don't _need_ it, but I think it makes the code more readable and easier to
understand.

+  std::vector<std::string> positive_test_filter_gtest_;
+  std::vector<std::string> positive_test_filter_file_;
   std::vector<std::string> positive_test_filter_;
+  std::vector<std::string> negative_test_filter_gtest_;
+  std::vector<std::string> negative_test_filter_file_;
   std::vector<std::string> negative_test_filter_;
 
   // Tests to use (cached result of TestLauncherDelegate::GetTests).