Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

tools/clang/plugins/tests/overridden_methods.h

Index: tools/clang/plugins/tests/overridden_methods.h
diff --git a/tools/clang/plugins/tests/overridden_methods.h b/tools/clang/plugins/tests/overridden_methods.h
index 69ee100c48b0763722d0a96640e084ef9943d53d..c5af9140e70bd1845898826d427693fc8d5ac732 100644
--- a/tools/clang/plugins/tests/overridden_methods.h
+++ b/tools/clang/plugins/tests/overridden_methods.h
@@ -21,7 +21,7 @@ class BaseClass {
 };
 
 class InterimClass : public BaseClass {
-  // Should warn about pure virtual methods.
+  // Should not warn about pure virtual methods.
   virtual void SomeMethod() = 0;
 };
 
@@ -42,12 +42,12 @@ class WebKitObserverImpl : blink::WebKitObserver {
 class DerivedClass : public InterimClass,
                      public webkit_glue::WebKitObserverImpl {
  public:
-  // Should warn about destructors.
+  // Should not warn about destructors.
   virtual ~DerivedClass() {}
   // Should warn.
   virtual void SomeMethod();
   // Should not warn if marked as override.
-  void SomeOtherMethod() override;
+  virtual void SomeOtherMethod() override;
   // Should warn for inline implementations.
   virtual void SomeInlineMethod() {}
   // Should not warn if overriding a method whose origin is blink.