| 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..bc2d1aca86a9dde33bf5ec1d8762d20efde1472e 100644
 | 
| --- a/tools/clang/plugins/tests/overridden_methods.txt
 | 
| +++ b/tools/clang/plugins/tests/overridden_methods.txt
 | 
| @@ -1,82 +1,82 @@
 | 
|  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'.
 | 
| +./overridden_methods.h:25:29: 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'.
 | 
| +                            ^
 | 
| +                             override
 | 
| +./overridden_methods.h:46:27: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual ~DerivedClass() {}
 | 
| -                         ^
 | 
| -                          override
 | 
| +                          ^
 | 
| +                           override
 | 
|  ./overridden_methods.h:48:28: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeMethod();
 | 
|                             ^
 | 
|                              override
 | 
| -./overridden_methods.h:52:34: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +./overridden_methods.h:52:35: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeInlineMethod() {}
 | 
| -                                 ^
 | 
| -                                  override
 | 
| -./overridden_methods.h:56:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +                                  ^
 | 
| +                                   override
 | 
| +./overridden_methods.h:56:40: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeConstMethod() const {}
 | 
| -                                      ^
 | 
| -                                       override
 | 
| -./overridden_methods.h:58:55: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +                                       ^
 | 
| +                                        override
 | 
| +./overridden_methods.h:58:54: 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:68: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeConstMethodWithExceptionSpec() const throw(int) {}
 | 
| -                                                                    ^
 | 
| -                                                                     override
 | 
| -./overridden_methods.h:63:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +                                                                   ^
 | 
| +                                                                    override
 | 
| +./overridden_methods.h:63:40: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeNonPureBaseMethod() {}
 | 
| -                                      ^
 | 
| -                                       override
 | 
| +                                       ^
 | 
| +                                        override
 | 
|  ./overridden_methods.h:65:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeMethodWithComment();  // This is a comment.
 | 
|                                        ^
 | 
|                                         override
 | 
| -./overridden_methods.h:67:46: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +./overridden_methods.h:67:47: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    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'.
 | 
| +                                              ^
 | 
| +                                               override
 | 
| +overridden_methods.cpp:15:29: 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'.
 | 
| +                            ^
 | 
| +                             override
 | 
| +overridden_methods.cpp:22:41: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual ~ImplementationDerivedClass() {}
 | 
| -                                       ^
 | 
| -                                        override
 | 
| +                                        ^
 | 
| +                                         override
 | 
|  overridden_methods.cpp:24:28: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeMethod();
 | 
|                             ^
 | 
|                              override
 | 
| -overridden_methods.cpp:28:34: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +overridden_methods.cpp:28:35: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeInlineMethod() {}
 | 
| -                                 ^
 | 
| -                                  override
 | 
| -overridden_methods.cpp:32:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +                                  ^
 | 
| +                                   override
 | 
| +overridden_methods.cpp:32:40: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeConstMethod() const {}
 | 
| -                                      ^
 | 
| -                                       override
 | 
| -overridden_methods.cpp:34:55: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +                                       ^
 | 
| +                                        override
 | 
| +overridden_methods.cpp:34:54: 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:68: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeConstMethodWithExceptionSpec() const throw(int) {}
 | 
| -                                                                    ^
 | 
| -                                                                     override
 | 
| -overridden_methods.cpp:39:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +                                                                   ^
 | 
| +                                                                    override
 | 
| +overridden_methods.cpp:39:40: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeNonPureBaseMethod() {}
 | 
| -                                      ^
 | 
| -                                       override
 | 
| +                                       ^
 | 
| +                                        override
 | 
|  overridden_methods.cpp:41:39: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeMethodWithComment();  // This is a comment.
 | 
|                                        ^
 | 
|                                         override
 | 
| -overridden_methods.cpp:43:46: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +overridden_methods.cpp:43:47: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void SomeMethodWithCommentAndBody() {}  // This is a comment.
 | 
| -                                             ^
 | 
| -                                              override
 | 
| +                                              ^
 | 
| +                                               override
 | 
|  20 warnings generated.
 | 
| 
 |