| Index: tools/clang/plugins/tests/virtual_specifiers.txt
 | 
| diff --git a/tools/clang/plugins/tests/virtual_specifiers.txt b/tools/clang/plugins/tests/virtual_specifiers.txt
 | 
| index a51236c674e16905944a427d015c3191d3aef0c3..135ebdd32373a4b9ba924319dfabade9092ca7be 100644
 | 
| --- a/tools/clang/plugins/tests/virtual_specifiers.txt
 | 
| +++ b/tools/clang/plugins/tests/virtual_specifiers.txt
 | 
| @@ -1,69 +1,69 @@
 | 
| -virtual_specifiers.cpp:36:21: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +virtual_specifiers.cpp:38:22: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    ~MissingOverride() {}
 | 
| -                    ^
 | 
| -                     override
 | 
| -virtual_specifiers.cpp:37:11: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +                     ^
 | 
| +                      override
 | 
| +virtual_specifiers.cpp:39:12: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    void F() {}
 | 
| -          ^
 | 
| -           override
 | 
| -virtual_specifiers.cpp:43:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
| +           ^
 | 
| +            override
 | 
| +virtual_specifiers.cpp:45:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
|    virtual ~VirtualAndOverride() OVERRIDE {}
 | 
|    ^~~~~~~~
 | 
| -virtual_specifiers.cpp:44:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
| +virtual_specifiers.cpp:46:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
|    virtual void F() OVERRIDE {}
 | 
|    ^~~~~~~~
 | 
| -virtual_specifiers.cpp:49:3: warning: [chromium-style] 'virtual' is redundant; 'final' implies 'virtual'.
 | 
| +virtual_specifiers.cpp:51:3: warning: [chromium-style] 'virtual' is redundant; 'final' implies 'virtual'.
 | 
|    virtual ~VirtualAndFinal() FINAL {}
 | 
|    ^~~~~~~~
 | 
| -virtual_specifiers.cpp:50:3: warning: [chromium-style] 'virtual' is redundant; 'final' implies 'virtual'.
 | 
| +virtual_specifiers.cpp:52:3: warning: [chromium-style] 'virtual' is redundant; 'final' implies 'virtual'.
 | 
|    virtual void F() FINAL {}
 | 
|    ^~~~~~~~
 | 
| -virtual_specifiers.cpp:55:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
| +virtual_specifiers.cpp:57:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
|    virtual ~VirtualAndOverrideFinal() OVERRIDE FINAL {}
 | 
|    ^~~~~~~~
 | 
| -virtual_specifiers.cpp:55:38: warning: [chromium-style] 'override' is redundant; 'final' implies 'override'.
 | 
| +virtual_specifiers.cpp:57:38: warning: [chromium-style] 'override' is redundant; 'final' implies 'override'.
 | 
|    virtual ~VirtualAndOverrideFinal() OVERRIDE FINAL {}
 | 
|                                       ^~~~~~~~~
 | 
| -virtual_specifiers.cpp:10:18: note: expanded from macro 'OVERRIDE'
 | 
| +virtual_specifiers.cpp:12:18: note: expanded from macro 'OVERRIDE'
 | 
|  #define OVERRIDE override
 | 
|                   ^
 | 
| -virtual_specifiers.cpp:56:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
| +virtual_specifiers.cpp:58:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
|    virtual void F() OVERRIDE FINAL {}
 | 
|    ^~~~~~~~
 | 
| -virtual_specifiers.cpp:56:20: warning: [chromium-style] 'override' is redundant; 'final' implies 'override'.
 | 
| +virtual_specifiers.cpp:58:20: warning: [chromium-style] 'override' is redundant; 'final' implies 'override'.
 | 
|    virtual void F() OVERRIDE FINAL {}
 | 
|                     ^~~~~~~~~
 | 
| -virtual_specifiers.cpp:10:18: note: expanded from macro 'OVERRIDE'
 | 
| +virtual_specifiers.cpp:12:18: note: expanded from macro 'OVERRIDE'
 | 
|  #define OVERRIDE override
 | 
|                   ^
 | 
| -virtual_specifiers.cpp:61:23: warning: [chromium-style] 'override' is redundant; 'final' implies 'override'.
 | 
| +virtual_specifiers.cpp:63:23: warning: [chromium-style] 'override' is redundant; 'final' implies 'override'.
 | 
|    ~OverrideAndFinal() OVERRIDE FINAL {}
 | 
|                        ^~~~~~~~~
 | 
| -virtual_specifiers.cpp:10:18: note: expanded from macro 'OVERRIDE'
 | 
| +virtual_specifiers.cpp:12:18: note: expanded from macro 'OVERRIDE'
 | 
|  #define OVERRIDE override
 | 
|                   ^
 | 
| -virtual_specifiers.cpp:62:12: warning: [chromium-style] 'override' is redundant; 'final' implies 'override'.
 | 
| +virtual_specifiers.cpp:64:12: warning: [chromium-style] 'override' is redundant; 'final' implies 'override'.
 | 
|    void F() OVERRIDE FINAL {}
 | 
|             ^~~~~~~~~
 | 
| -virtual_specifiers.cpp:10:18: note: expanded from macro 'OVERRIDE'
 | 
| +virtual_specifiers.cpp:12:18: note: expanded from macro 'OVERRIDE'
 | 
|  #define OVERRIDE override
 | 
|                   ^
 | 
| -virtual_specifiers.cpp:67:19: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +virtual_specifiers.cpp:69:20: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual void F() = 0;
 | 
| -                  ^
 | 
| -                   override
 | 
| -virtual_specifiers.cpp:71:11: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +                   ^
 | 
| +                    override
 | 
| +virtual_specifiers.cpp:73:12: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    void F() = 0;
 | 
| -          ^
 | 
| -           override
 | 
| -virtual_specifiers.cpp:79:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
| +           ^
 | 
| +            override
 | 
| +virtual_specifiers.cpp:81:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
|    virtual void F() override = 0;
 | 
|    ^~~~~~~~
 | 
| -virtual_specifiers.cpp:102:20: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
| +virtual_specifiers.cpp:110:20: warning: [chromium-style] Overriding method must be marked with 'override' or 'final'.
 | 
|    virtual ~MyTest();
 | 
|                     ^
 | 
|                      override
 | 
| -virtual_specifiers.cpp:103:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
| +virtual_specifiers.cpp:111:3: warning: [chromium-style] 'virtual' is redundant; 'override' implies 'virtual'.
 | 
|    virtual void SetUp() override;
 | 
|    ^~~~~~~~
 | 
|  17 warnings generated.
 | 
| 
 |