Merge to XFA: Consolidate test support code.

samples/BUILD.gn

Index: samples/BUILD.gn
diff --git a/samples/BUILD.gn b/samples/BUILD.gn
index f3bcbda418142dace69e455670c554ef40386435..2039d2f4dd777793a8520266dbd255eb2e712f47 100644
--- a/samples/BUILD.gn
+++ b/samples/BUILD.gn
@@ -5,6 +5,7 @@
 import("../pdfium.gni")
 
 group("samples") {
+  testonly = true

[Lei Zhang, 2015/10/19 22:53:43]

Do these need to be merged to master?

   deps = [
     ":pdfium_test",
   ]
@@ -25,12 +26,14 @@ config("pdfium_samples_config") {
 }
 
 executable("pdfium_test") {
+  testonly = true
   sources = [
     "image_diff_png.cc",
     "pdfium_test.cc",
   ]
   deps = [
-    "//third_party/pdfium",
+    "//third_party/pdfium:pdfium",
+    "//third_party/pdfium:test_support",
   ]
   if (pdf_enable_v8) {
     deps += [
@@ -45,6 +48,7 @@ executable("pdfium_test") {
 }
 
 executable("pdfium_diff") {
+  testonly = true
   sources = [
     "image_diff.cc",
     "image_diff_png.cc",