| Index: tools/clang/plugins/FindBadConstructsAction.cpp
 | 
| diff --git a/tools/clang/plugins/FindBadConstructsAction.cpp b/tools/clang/plugins/FindBadConstructsAction.cpp
 | 
| index 3fedd8feb088df2a5eb4f972c175e36e7c37a384..df9b57a962b5b8c83c85d938a2527669f0b0bca3 100644
 | 
| --- a/tools/clang/plugins/FindBadConstructsAction.cpp
 | 
| +++ b/tools/clang/plugins/FindBadConstructsAction.cpp
 | 
| @@ -47,21 +47,12 @@ bool FindBadConstructsAction::ParseArgs(const CompilerInstance& instance,
 | 
|      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] == "enforce-in-pdf") {
 | 
| -      // TODO(thestig): This is now always on. Remove support for this flag once
 | 
| -      // the build no longer passes it in.
 | 
|      } else if (args[i] == "enforce-in-thirdparty-webkit") {
 | 
|        options_.enforce_in_thirdparty_webkit = true;
 | 
|      } else if (args[i] == "check-enum-last-value") {
 | 
|        // TODO(tsepez): Enable this by default once http://crbug.com/356815
 | 
|        // and http://crbug.com/356816 are fixed.
 | 
|        options_.check_enum_last_value = true;
 | 
| -    } else if (args[i] == "check-templates") {
 | 
| -      // TODO(thakis): This is now always on. Remove support for this flag once
 | 
| -      // the build no longer passes it in.
 | 
| -    } else if (args[i] == "follow-macro-expansion") {
 | 
| -      // TODO(thakis): This is now always on. Remove support for this flag once
 | 
| -      // the build no longer passes it in.
 | 
|      } else if (args[i] == "no-realpath") {
 | 
|        options_.no_realpath = true;
 | 
|      } else if (args[i] == "check-ipc") {
 | 
| 
 |