Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2151)

Unified Diff: chrome/test/logging/win/test_log_collector.cc

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/logging/win/log_file_printer.cc ('k') | chrome/test/ppapi/ppapi_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/logging/win/test_log_collector.cc
diff --git a/chrome/test/logging/win/test_log_collector.cc b/chrome/test/logging/win/test_log_collector.cc
index ec582a5e3230698d03201a177fecaf91ed8080db..a218d602b32cbd5594cc7c3d9c5325f672d9419b 100644
--- a/chrome/test/logging/win/test_log_collector.cc
+++ b/chrome/test/logging/win/test_log_collector.cc
@@ -50,43 +50,40 @@ class TestLogCollector {
// Ownership of |default_result_printer| is taken by the new instance.
EventListener(TestLogCollector* test_log_collector,
testing::TestEventListener* default_result_printer);
- virtual ~EventListener();
+ ~EventListener() override;
// Sets up the log collector.
- virtual void OnTestProgramStart(
- const testing::UnitTest& unit_test) override {
+ void OnTestProgramStart(const testing::UnitTest& unit_test) override {
test_log_collector_->SetUp();
default_result_printer_->OnTestProgramStart(unit_test);
}
- virtual void OnTestIterationStart(const testing::UnitTest& unit_test,
- int iteration) override {
+ void OnTestIterationStart(const testing::UnitTest& unit_test,
+ int iteration) override {
default_result_printer_->OnTestIterationStart(unit_test, iteration);
}
- virtual void OnEnvironmentsSetUpStart(
- const testing::UnitTest& unit_test) override {
+ void OnEnvironmentsSetUpStart(const testing::UnitTest& unit_test) override {
default_result_printer_->OnEnvironmentsSetUpStart(unit_test);
}
- virtual void OnEnvironmentsSetUpEnd(
- const testing::UnitTest& unit_test) override {
+ void OnEnvironmentsSetUpEnd(const testing::UnitTest& unit_test) override {
default_result_printer_->OnEnvironmentsSetUpEnd(unit_test);
}
- virtual void OnTestCaseStart(const testing::TestCase& test_case) override {
+ void OnTestCaseStart(const testing::TestCase& test_case) override {
default_result_printer_->OnTestCaseStart(test_case);
}
// Calls back to the collector to start collecting logs for this test.
- virtual void OnTestStart(const testing::TestInfo& test_info) override {
+ void OnTestStart(const testing::TestInfo& test_info) override {
default_result_printer_->OnTestStart(test_info);
test_log_collector_->StartSessionForTest(test_info);
}
// Calls back to the collector with the partial result. If the collector
// does not handle it, it is given to the default result printer.
- virtual void OnTestPartResult(
+ void OnTestPartResult(
const testing::TestPartResult& test_part_result) override {
if (!test_log_collector_->LogTestPartResult(test_part_result))
default_result_printer_->OnTestPartResult(test_part_result);
@@ -94,32 +91,32 @@ class TestLogCollector {
// Calls back to the collector to handle the collected log for the test that
// has just ended.
- virtual void OnTestEnd(const testing::TestInfo& test_info) override {
+ void OnTestEnd(const testing::TestInfo& test_info) override {
test_log_collector_->ProcessSessionForTest(test_info);
default_result_printer_->OnTestEnd(test_info);
}
- virtual void OnTestCaseEnd(const testing::TestCase& test_case) override {
+ void OnTestCaseEnd(const testing::TestCase& test_case) override {
default_result_printer_->OnTestCaseEnd(test_case);
}
- virtual void OnEnvironmentsTearDownStart(
+ void OnEnvironmentsTearDownStart(
const testing::UnitTest& unit_test) override {
default_result_printer_->OnEnvironmentsTearDownStart(unit_test);
}
- virtual void OnEnvironmentsTearDownEnd(
+ void OnEnvironmentsTearDownEnd(
const testing::UnitTest& unit_test) override {
default_result_printer_->OnEnvironmentsTearDownEnd(unit_test);
}
- virtual void OnTestIterationEnd(const testing::UnitTest& unit_test,
- int iteration) override {
+ void OnTestIterationEnd(const testing::UnitTest& unit_test,
+ int iteration) override {
default_result_printer_->OnTestIterationEnd(unit_test, iteration);
}
// Tears down the log collector.
- virtual void OnTestProgramEnd(const testing::UnitTest& unit_test) override {
+ void OnTestProgramEnd(const testing::UnitTest& unit_test) override {
default_result_printer_->OnTestProgramEnd(unit_test);
test_log_collector_->TearDown();
}
« no previous file with comments | « chrome/test/logging/win/log_file_printer.cc ('k') | chrome/test/ppapi/ppapi_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698