Remove disabling flag.

Won't have an effect until the next Clang roll, but use of it was already removed in r111969.

BUG=104314
TEST=green builds

Review URL: http://codereview.chromium.org/8729041

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112011 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 32 deletions

diff --git a/tools/clang/plugins/FindBadConstructs.cpp b/tools/clang/plugins/FindBadConstructs.cpp
index fbc5274..4b2f800 100644
--- a/tools/clang/plugins/FindBadConstructs.cpp
+++ b/tools/clang/plugins/FindBadConstructs.cpp
@@ -39,10 +39,8 @@ bool TypeHasNonTrivialDtor(const Type* type) {
 // Searches for constructs that we know we don't want in the Chromium code base.
 class FindBadConstructsConsumer : public ChromeClassTester {
  public:
-  FindBadConstructsConsumer(CompilerInstance& instance,
-                            bool skip_override)
-      : ChromeClassTester(instance),
-        skip_override_(skip_override) {}
+  FindBadConstructsConsumer(CompilerInstance& instance)
+      : ChromeClassTester(instance) {}
 
   virtual void CheckChromeClass(const SourceLocation& record_location,
                                 CXXRecordDecl* record) {
@@ -178,9 +176,6 @@ class FindBadConstructsConsumer : public ChromeClassTester {
   }
 
   void CheckOverriddenMethod(const CXXMethodDecl* method) {
-    if (skip_override_)
-      return;
-
     if (!method->size_overridden_methods() || method->getAttr<OverrideAttr>())
       return;
 
@@ -285,41 +280,19 @@ class FindBadConstructsConsumer : public ChromeClassTester {
       }
     }
   }
-
- private:
-  // TODO(avi): Remove this (and all related code) once the override warning is
-  // enabled on all bots.
-  bool skip_override_;
 };
 
 class FindBadConstructsAction : public PluginASTAction {
- public:
-  FindBadConstructsAction() : skip_override_(false) {
-  }
-
  protected:
   ASTConsumer* CreateASTConsumer(CompilerInstance &CI, llvm::StringRef ref) {
-    return new FindBadConstructsConsumer(CI, skip_override_);
+    return new FindBadConstructsConsumer(CI);
   }
 
   bool ParseArgs(const CompilerInstance &CI,
                  const std::vector<std::string>& args) {
-    bool parsed = true;
-
-    for (size_t i = 0; i < args.size() && parsed; ++i) {
-      if (args[i] == "skip-override") {
-        skip_override_ = true;
-      } else {
-        parsed = false;
-        llvm::errs() << "Unknown arg: " << args[i] << "\n";
-      }
-    }
-
-    return parsed;
+    // We don't take any additional arguments here.
+    return true;
   }
-
- private:
-  bool skip_override_;
 };
 
 }  // namespace