Update from https://crrev.com/312398

base/test/launcher/test_launcher.cc

 // Copyright 2013 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 "base/test/launcher/test_launcher.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #endif
 
@@ skipping 811 matching lines @@
       SplitString(filter, ':', &positive_test_filter_);
     } else {
       // Everything up to the dash.
       SplitString(filter.substr(0, dash_pos), ':', &positive_test_filter_);
 
       // Everything after the dash.
       SplitString(filter.substr(dash_pos + 1), ':', &negative_test_filter_);
     }
   }
 
+  if (!launcher_delegate_->GetTests(&tests_)) {
+    LOG(ERROR) << "Failed to get list of tests.";
+    return false;
+  }
+
   if (!results_tracker_.Init(*command_line)) {
     LOG(ERROR) << "Failed to initialize test results tracker.";
     return 1;
   }
 
 #if defined(NDEBUG)
   results_tracker_.AddGlobalTag("MODE_RELEASE");
 #else
   results_tracker_.AddGlobalTag("MODE_DEBUG");
 #endif
@@ skipping 51 matching lines @@
 #endif
 
 #if defined(ARCH_CPU_64_BITS)
   results_tracker_.AddGlobalTag("CPU_64_BITS");
 #endif
 
   return true;
 }
 
 void TestLauncher::RunTests() {
-  std::vector<SplitTestName> tests(GetCompiledInTests());
-
   std::vector<std::string> test_names;
-
-  for (size_t i = 0; i < tests.size(); i++) {
-    std::string test_name = FormatFullTestName(tests[i].first, tests[i].second);
+  for (size_t i = 0; i < tests_.size(); i++) {
+    std::string test_name = FormatFullTestName(
+        tests_[i].first, tests_[i].second);
 
     results_tracker_.AddTest(test_name);
 
     const CommandLine* command_line = CommandLine::ForCurrentProcess();
     if (test_name.find("DISABLED") != std::string::npos) {
       results_tracker_.AddDisabledTest(test_name);
 
       // Skip disabled tests unless explicitly requested.
       if (!command_line->HasSwitch(kGTestRunDisabledTestsFlag))
         continue;
     }
 
-    if (!launcher_delegate_->ShouldRunTest(tests[i].first, tests[i].second))
+    if (!launcher_delegate_->ShouldRunTest(tests_[i].first, tests_[i].second))
       continue;
 
     // Skip the test that doesn't match the filter (if given).
     if (!positive_test_filter_.empty()) {
       bool found = false;
       for (size_t k = 0; k < positive_test_filter_.size(); ++k) {
         if (MatchPattern(test_name, positive_test_filter_[k])) {
           found = true;
           break;
         }
@@ skipping 149 matching lines @@
   }
 
   std::string snippet(full_output.substr(run_pos));
   if (end_pos != std::string::npos)
     snippet = full_output.substr(run_pos, end_pos - run_pos);
 
   return snippet;
 }
 
 }  // namespace base