roll clang 140930:142072

tools/clang/plugins/tests/virtual_methods.h

Index: tools/clang/plugins/tests/virtual_methods.h
diff --git a/tools/clang/plugins/tests/virtual_methods.h b/tools/clang/plugins/tests/virtual_methods.h
index cb1846eed1e2b8279f5969f72636f8a01f90ed39..d256f07cd7eed163aad7593c77ec820391132021 100644
--- a/tools/clang/plugins/tests/virtual_methods.h
+++ b/tools/clang/plugins/tests/virtual_methods.h
@@ -23,4 +23,17 @@ class WarnOnMissingVirtual : public VirtualMethodsInHeaders {
   void MethodHasNoArguments();
 };
 
+// Don't complain about things in a 'testing' namespace.
+namespace testing {
+struct TestStruct {};
+}  // namespace testing
+
+class VirtualMethodsInHeadersTesting : public VirtualMethodsInHeaders {
+ public:
+  // Don't complain about no virtual testing methods.
+  void MethodHasNoArguments();
+ private:
+  testing::TestStruct tester_;
+};
+
 #endif  // VIRTUAL_METHODS_H_