From b64200de656b6f7e3254120c524ab1a2c8cc5e90 Mon Sep 17 00:00:00 2001
From: dmichael <dmichael@chromium.org>
Date: Fri, 16 Jan 2015 14:18:59 -0800
Subject: [PATCH] Remove unneeded check-weak-ptr-factory-order flag

All violations have been fixed and the flag is on in the Chromium build, so it's no
longer needed.

BUG=303818

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

Cr-Commit-Position: refs/heads/master@{#311965}
---
 tools/clang/plugins/FindBadConstructsAction.cpp   | 3 ---
 tools/clang/plugins/FindBadConstructsConsumer.cpp | 3 +--
 tools/clang/plugins/Options.h                     | 2 --
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/tools/clang/plugins/FindBadConstructsAction.cpp b/tools/clang/plugins/FindBadConstructsAction.cpp
index 7563c2107852..e98301b8bd4f 100644
--- a/tools/clang/plugins/FindBadConstructsAction.cpp
+++ b/tools/clang/plugins/FindBadConstructsAction.cpp
@@ -49,9 +49,6 @@ 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] == "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.
diff --git a/tools/clang/plugins/FindBadConstructsConsumer.cpp b/tools/clang/plugins/FindBadConstructsConsumer.cpp
index 4f281f1da036..affac561cca2 100644
--- a/tools/clang/plugins/FindBadConstructsConsumer.cpp
+++ b/tools/clang/plugins/FindBadConstructsConsumer.cpp
@@ -151,8 +151,7 @@ void FindBadConstructsConsumer::CheckChromeClass(SourceLocation record_location,
 
   CheckRefCountedDtors(record_location, record);
 
-  if (options_.check_weak_ptr_factory_order)
-    CheckWeakPtrFactoryMembers(record_location, record);
+  CheckWeakPtrFactoryMembers(record_location, record);
 }
 
 void FindBadConstructsConsumer::CheckChromeEnum(SourceLocation enum_location,
diff --git a/tools/clang/plugins/Options.h b/tools/clang/plugins/Options.h
index 5611ca82e4df..ee4185ea8b63 100644
--- a/tools/clang/plugins/Options.h
+++ b/tools/clang/plugins/Options.h
@@ -10,13 +10,11 @@ namespace chrome_checker {
 struct Options {
   Options()
       : check_base_classes(false),
-        check_weak_ptr_factory_order(false),
         check_enum_last_value(false),
         strict_virtual_specifiers(false),
         with_ast_visitor(false) {}
 
   bool check_base_classes;
-  bool check_weak_ptr_factory_order;
   bool check_enum_last_value;
   bool strict_virtual_specifiers;
   bool with_ast_visitor;
-- 
2.11.4.GIT