Commit 357e910c authored by dcheng's avatar dcheng Committed by Commit bot

Remove unused plugin argument to skip virtual method checks in .cc files

BUG=115047

Review URL: https://codereview.chromium.org/592223002

Cr-Commit-Position: refs/heads/master@{#296159}
parent fcd74526
...@@ -26,10 +26,7 @@ bool FindBadConstructsAction::ParseArgs(const CompilerInstance& instance, ...@@ -26,10 +26,7 @@ bool FindBadConstructsAction::ParseArgs(const CompilerInstance& instance,
bool parsed = true; bool parsed = true;
for (size_t i = 0; i < args.size() && parsed; ++i) { for (size_t i = 0; i < args.size() && parsed; ++i) {
if (args[i] == "skip-virtuals-in-implementations") { if (args[i] == "check-base-classes") {
// TODO(rsleevi): Remove this once http://crbug.com/115047 is fixed.
options_.check_virtuals_in_implementations = false;
} else if (args[i] == "check-base-classes") {
// TODO(rsleevi): Remove this once http://crbug.com/123295 is fixed. // TODO(rsleevi): Remove this once http://crbug.com/123295 is fixed.
options_.check_base_classes = true; options_.check_base_classes = true;
} else if (args[i] == "check-weak-ptr-factory-order") { } else if (args[i] == "check-weak-ptr-factory-order") {
......
...@@ -101,13 +101,11 @@ void FindBadConstructsConsumer::CheckChromeClass(SourceLocation record_location, ...@@ -101,13 +101,11 @@ void FindBadConstructsConsumer::CheckChromeClass(SourceLocation record_location,
CheckCtorDtorWeight(record_location, record); CheckCtorDtorWeight(record_location, record);
} }
if (!implementation_file || options_.check_virtuals_in_implementations) { bool warn_on_inline_bodies = !implementation_file;
bool warn_on_inline_bodies = !implementation_file;
// Check that all virtual methods are marked accordingly with both // Check that all virtual methods are marked accordingly with both
// virtual and OVERRIDE. // virtual and OVERRIDE.
CheckVirtualMethods(record_location, record, warn_on_inline_bodies); CheckVirtualMethods(record_location, record, warn_on_inline_bodies);
}
CheckRefCountedDtors(record_location, record); CheckRefCountedDtors(record_location, record);
......
...@@ -10,12 +10,10 @@ namespace chrome_checker { ...@@ -10,12 +10,10 @@ namespace chrome_checker {
struct Options { struct Options {
Options() Options()
: check_base_classes(false), : check_base_classes(false),
check_virtuals_in_implementations(true),
check_weak_ptr_factory_order(false), check_weak_ptr_factory_order(false),
check_enum_last_value(false) {} check_enum_last_value(false) {}
bool check_base_classes; bool check_base_classes;
bool check_virtuals_in_implementations;
bool check_weak_ptr_factory_order; bool check_weak_ptr_factory_order;
bool check_enum_last_value; bool check_enum_last_value;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment