| Index: tools/clang/plugins/FindBadConstructsAction.cpp
|
| diff --git a/tools/clang/plugins/FindBadConstructsAction.cpp b/tools/clang/plugins/FindBadConstructsAction.cpp
|
| index be7a9506a78cd27737bade5303f4c727511d0ab8..ccf7f6397f256d0c5dab4199213b12e79f4c4b77 100644
|
| --- a/tools/clang/plugins/FindBadConstructsAction.cpp
|
| +++ b/tools/clang/plugins/FindBadConstructsAction.cpp
|
| @@ -26,10 +26,7 @@ bool FindBadConstructsAction::ParseArgs(const CompilerInstance& instance,
|
| bool parsed = true;
|
|
|
| for (size_t i = 0; i < args.size() && parsed; ++i) {
|
| - if (args[i] == "skip-virtuals-in-implementations") {
|
| - // TODO(rsleevi): Remove this once http://crbug.com/115047 is fixed.
|
| - options_.check_virtuals_in_implementations = false;
|
| - } else if (args[i] == "check-base-classes") {
|
| + if (args[i] == "check-base-classes") {
|
| // TODO(rsleevi): Remove this once http://crbug.com/123295 is fixed.
|
| options_.check_base_classes = true;
|
| } else if (args[i] == "check-weak-ptr-factory-order") {
|
|
|