Revert "Roll Clang 218707:223109 (+r223211, +r223219, -r220714)" and follow-ups.

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 3ee0333aa645459e3d26dc5bcbf5c8b5bdb92304..199876b058a0ea0962dd77ae0ec4dd0590578787 100644
--- a/tools/clang/plugins/tests/overridden_methods.txt
+++ b/tools/clang/plugins/tests/overridden_methods.txt
@@ -11,14 +11,14 @@ In file included from overridden_methods.cpp:5:
   virtual void SomeConstMethod() const {}
                                       ^
                                        override
-./overridden_methods.h:58:55: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
+./overridden_methods.h:58:53: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
   virtual void SomeMethodWithExceptionSpec() throw() {}
-                                                      ^
-                                                       override
-./overridden_methods.h:61:69: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
+                                                    ^
+                                                     override
+./overridden_methods.h:61:67: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
   virtual void SomeConstMethodWithExceptionSpec() const throw(int) {}
-                                                                    ^
-                                                                     override
+                                                                  ^
+                                                                   override
 ./overridden_methods.h:63:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
   virtual void SomeNonPureBaseMethod() {}
                                       ^
@@ -43,14 +43,14 @@ overridden_methods.cpp:32:39: warning: [chromium-style] Overriding method must b
   virtual void SomeConstMethod() const {}
                                       ^
                                        override
-overridden_methods.cpp:34:55: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
+overridden_methods.cpp:34:53: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
   virtual void SomeMethodWithExceptionSpec() throw() {}
-                                                      ^
-                                                       override
-overridden_methods.cpp:37:69: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
+                                                    ^
+                                                     override
+overridden_methods.cpp:37:67: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
   virtual void SomeConstMethodWithExceptionSpec() const throw(int) {}
-                                                                    ^
-                                                                     override
+                                                                  ^
+                                                                   override
 overridden_methods.cpp:39:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
   virtual void SomeNonPureBaseMethod() {}
                                       ^