Update from https://crrev.com/312398

tools/clang/plugins/FindBadConstructsAction.cpp

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "FindBadConstructsAction.h"
 
 #include "clang/AST/ASTConsumer.h"
 #include "clang/Frontend/FrontendPluginRegistry.h"
 
 #include "FindBadConstructsConsumer.h"
@@ skipping 31 matching lines @@
 }
 
 bool FindBadConstructsAction::ParseArgs(const CompilerInstance& instance,
                                         const std::vector<std::string>& args) {
   bool parsed = true;
 
   for (size_t i = 0; i < args.size() && parsed; ++i) {
     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") {
-      // TODO(dmichael): Remove this once http://crbug.com/303818 is fixed.
-      options_.check_weak_ptr_factory_order = 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] == "strict-virtual-specifiers") {
       options_.strict_virtual_specifiers = true;
     } else if (args[i] == "with-ast-visitor") {
       options_.with_ast_visitor = true;
+    } else if (args[i] == "check-templates") {
+      options_.check_templates = true;
     } else {
       parsed = false;
       llvm::errs() << "Unknown clang plugin argument: " << args[i] << "\n";
     }
   }
 
   return parsed;
 }
 
 }  // namespace chrome_checker
 
 static FrontendPluginRegistry::Add<chrome_checker::FindBadConstructsAction> X(
     "find-bad-constructs",
     "Finds bad C++ constructs");