Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

tools/clang/plugins/tests/overridden_methods.txt

Index: tools/clang/plugins/tests/overridden_methods.txt
diff --git a/tools/clang/plugins/tests/overridden_methods.txt b/tools/clang/plugins/tests/overridden_methods.txt
index 69ff2b12a6466913af5c4e3921c86aef4e3963eb..3ee0333aa645459e3d26dc5bcbf5c8b5bdb92304 100644
--- a/tools/clang/plugins/tests/overridden_methods.txt
+++ b/tools/clang/plugins/tests/overridden_methods.txt
@@ -1,12 +1,4 @@
 In file included from overridden_methods.cpp:5:
-./overridden_methods.h:25:28: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
-  virtual void SomeMethod() = 0;
-                           ^
-                            override
-./overridden_methods.h:46:26: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
-  virtual ~DerivedClass() {}
-                         ^
-                          override
 ./overridden_methods.h:48:28: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
   virtual void SomeMethod();
                            ^
@@ -39,14 +31,6 @@ In file included from overridden_methods.cpp:5:
   virtual void SomeMethodWithCommentAndBody() {}  // This is a comment.
                                              ^
                                               override
-overridden_methods.cpp:15:28: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
-  virtual void SomeMethod() = 0;
-                           ^
-                            override
-overridden_methods.cpp:22:40: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
-  virtual ~ImplementationDerivedClass() {}
-                                       ^
-                                        override
 overridden_methods.cpp:24:28: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
   virtual void SomeMethod();
                            ^
@@ -79,4 +63,4 @@ overridden_methods.cpp:43:46: warning: [chromium-style] Overriding method must b
   virtual void SomeMethodWithCommentAndBody() {}  // This is a comment.
                                              ^
                                               override
-20 warnings generated.
+16 warnings generated.