| Index: base/test/launcher/unit_test_launcher.cc
|
| diff --git a/base/test/launcher/unit_test_launcher.cc b/base/test/launcher/unit_test_launcher.cc
|
| index 0cbae2fac366d232ef9f7eb75a1f85eb32cef282..51dc19a4c077b6f1bd12234b358441d7f5cfa8e6 100644
|
| --- a/base/test/launcher/unit_test_launcher.cc
|
| +++ b/base/test/launcher/unit_test_launcher.cc
|
| @@ -118,16 +118,16 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate {
|
| FilePath output_file;
|
| };
|
|
|
| - virtual bool ShouldRunTest(const testing::TestCase* test_case,
|
| - const testing::TestInfo* test_info) OVERRIDE {
|
| + bool ShouldRunTest(const testing::TestCase* test_case,
|
| + const testing::TestInfo* test_info) override {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| // There is no additional logic to disable specific tests.
|
| return true;
|
| }
|
|
|
| - virtual size_t RunTests(TestLauncher* test_launcher,
|
| - const std::vector<std::string>& test_names) OVERRIDE {
|
| + size_t RunTests(TestLauncher* test_launcher,
|
| + const std::vector<std::string>& test_names) override {
|
| DCHECK(thread_checker_.CalledOnValidThread());
|
|
|
| std::vector<std::string> batch;
|
| @@ -145,9 +145,8 @@ class UnitTestLauncherDelegate : public TestLauncherDelegate {
|
| return test_names.size();
|
| }
|
|
|
| - virtual size_t RetryTests(
|
| - TestLauncher* test_launcher,
|
| - const std::vector<std::string>& test_names) OVERRIDE {
|
| + size_t RetryTests(TestLauncher* test_launcher,
|
| + const std::vector<std::string>& test_names) override {
|
| MessageLoop::current()->PostTask(
|
| FROM_HERE,
|
| Bind(&UnitTestLauncherDelegate::RunSerially,
|
|
|