Remove test suffixes from included filename in boilerplate.py.

tools/boilerplate.py

Index: tools/boilerplate.py
diff --git a/tools/boilerplate.py b/tools/boilerplate.py
index 74a2a4d10e13413e0a32d180bce534214d9a614c..b26493e710f27f5d804950ab0ab241e737d6f73b 100755
--- a/tools/boilerplate.py
+++ b/tools/boilerplate.py
@@ -51,15 +51,22 @@ def _CppHeader(filename):
   ])
 
 
-def _CppImplementation(filename):
+def _RemoveTestSuffix(filename):
   base, _ = os.path.splitext(filename)
-  include = '#include "' + base + '.h"'
+  suffixes = [ '_test', '_unittest', '_browsertest' ]
+  for suffix in suffixes:
+    l = len(suffix)
+    if base[-l:] == suffix:
+      return base[:-l]
+  return base
+
+def _CppImplementation(filename):
+  include = '#include "' + _RemoveTestSuffix(filename) + '.h"'
   return '\n'.join(['', include])
 
 
 def _ObjCppImplementation(filename):
-  base, _ = os.path.splitext(filename)
-  include = '#import "' + base + '.h"'
+  include = '#import "' + _RemoveTestSuffix(filename) + '.h"'
   return '\n'.join(['', include])