Use the {{trailer}} macro in more PDFs.

Change-Id: Idd985dfe2def8ae9dfb7921d006129f66d0bce28
Reviewed-on: https://pdfium-review.googlesource.com/c/45630
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/testing/resources/annotation_highlight_rollover_ap.in b/testing/resources/annotation_highlight_rollover_ap.in
index 426ed88..4ee637d 100644
--- a/testing/resources/annotation_highlight_rollover_ap.in
+++ b/testing/resources/annotation_highlight_rollover_ap.in
@@ -78,9 +78,6 @@
 endobj
 
 {{xref}}
-trailer <<
-  /Root 1 0 R
-  /Size 6
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_507316.in b/testing/resources/bug_507316.in
index 87dd5c3..1da3743 100644
--- a/testing/resources/bug_507316.in
+++ b/testing/resources/bug_507316.in
@@ -118,9 +118,6 @@
 endstream
 endobj
 {{xref}}
-trailer <<
-  /Size 16
-  /Root 1 0 R
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_507316.pdf b/testing/resources/bug_507316.pdf
index ecc205c..5947b3c 100644
--- a/testing/resources/bug_507316.pdf
+++ b/testing/resources/bug_507316.pdf
@@ -137,8 +137,8 @@
 0000001365 00000 n 
 0000001433 00000 n 
 trailer <<
-  /Size 16
   /Root 1 0 R
+  /Size 16
 >>
 startxref
 1534
diff --git a/testing/resources/bug_544880.in b/testing/resources/bug_544880.in
index 926a491..b004dd9 100644
--- a/testing/resources/bug_544880.in
+++ b/testing/resources/bug_544880.in
@@ -11,9 +11,6 @@
 >>
 endobj
 {{xref}}
-trailer <<
-  /Size 3
-  /Root 1 0 R
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_544880.pdf b/testing/resources/bug_544880.pdf
index 4a8e5b9..687ea32 100644
--- a/testing/resources/bug_544880.pdf
+++ b/testing/resources/bug_544880.pdf
@@ -17,8 +17,8 @@
 0000000015 00000 n 
 0000000068 00000 n 
 trailer <<
-  /Size 3
   /Root 1 0 R
+  /Size 3
 >>
 startxref
 131
diff --git a/testing/resources/bug_547706.in b/testing/resources/bug_547706.in
index 4c31f19..7a993a8 100644
--- a/testing/resources/bug_547706.in
+++ b/testing/resources/bug_547706.in
@@ -35,9 +35,6 @@
 endobj
 
 {{xref}}
-trailer <<
-  /Root 1 0 R
-  /Size 9
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_551460.in b/testing/resources/bug_551460.in
index 5ed2f3f..2ceeefe 100644
--- a/testing/resources/bug_551460.in
+++ b/testing/resources/bug_551460.in
@@ -67,9 +67,6 @@
 endobj
 
 {{xref}}
-trailer <<
-  /Root 1 0 R
-  /Size 11
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_554151.in b/testing/resources/bug_554151.in
index 3087159..7a68f0a 100644
--- a/testing/resources/bug_554151.in
+++ b/testing/resources/bug_554151.in
@@ -51,9 +51,6 @@
 endobj
 
 {{xref}}
-trailer <<
-  /Root 1 0 R
-  /Size 8
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_555784.in b/testing/resources/bug_555784.in
index c6a1f43..95018f8 100644
--- a/testing/resources/bug_555784.in
+++ b/testing/resources/bug_555784.in
@@ -66,9 +66,6 @@
 endobj
 
 {{xref}}
-trailer <<
-  /Root 1 0 R
-  /Size 11
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_57.in b/testing/resources/bug_57.in
index 0825efd..207aae4 100644
--- a/testing/resources/bug_57.in
+++ b/testing/resources/bug_57.in
@@ -40,9 +40,6 @@
 endstream
 endobj
 {{xref}}
-trailer <<
-  /Size 6
-  /Root 1 0 R
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_57.pdf b/testing/resources/bug_57.pdf
index 0c3f7df..66ec4ec 100644
--- a/testing/resources/bug_57.pdf
+++ b/testing/resources/bug_57.pdf
@@ -49,8 +49,8 @@
 0000000280 00000 n 
 0000000409 00000 n 
 trailer <<
-  /Size 6
   /Root 1 0 R
+  /Size 6
 >>
 startxref
 506
diff --git a/testing/resources/bug_572871.in b/testing/resources/bug_572871.in
index 20cb943..dc17591 100644
--- a/testing/resources/bug_572871.in
+++ b/testing/resources/bug_572871.in
@@ -88,9 +88,6 @@
 endstream
 endobj
 {{xref}}
-trailer <<
-  /Size 14
-  /Root 1 0 R
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/bug_572871.pdf b/testing/resources/bug_572871.pdf
index 1f26bc5..3a8b71e 100644
--- a/testing/resources/bug_572871.pdf
+++ b/testing/resources/bug_572871.pdf
@@ -105,8 +105,8 @@
 0000000981 00000 n 
 0000001049 00000 n 
 trailer <<
-  /Size 14
   /Root 1 0 R
+  /Size 14
 >>
 startxref
 1132
diff --git a/testing/resources/bug_713197.in b/testing/resources/bug_713197.in
index 49eaee2..9186025 100644
--- a/testing/resources/bug_713197.in
+++ b/testing/resources/bug_713197.in
@@ -19,9 +19,6 @@
 >>

 endobj

 {{xref}}

-trailer <<

-  /Size 4

-  /Root 1 0 R

->>

+{{trailer}}

 {{startxref}}

 %%EOF

diff --git a/testing/resources/bug_713197.pdf b/testing/resources/bug_713197.pdf
index 571cde9..c1e890a 100644
--- a/testing/resources/bug_713197.pdf
+++ b/testing/resources/bug_713197.pdf
@@ -25,9 +25,9 @@
 0000000016 00000 n 
 0000000074 00000 n 
 0000000171 00000 n 
-trailer <<

-  /Size 4

-  /Root 1 0 R

+trailer <<
+  /Root 1 0 R
+  /Size 4
 >>

 startxref
 260

diff --git a/testing/resources/pixel/bug_491_invisible.in b/testing/resources/pixel/bug_491_invisible.in
index 75b7e58..56632be 100644
--- a/testing/resources/pixel/bug_491_invisible.in
+++ b/testing/resources/pixel/bug_491_invisible.in
@@ -67,9 +67,6 @@
 >>
 endobj
 {{xref}}
-trailer <<
-  /Size 9
-  /Root 1 0 R
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/pixel/bug_491_unspecified.in b/testing/resources/pixel/bug_491_unspecified.in
index b1e7312..e93c816 100644
--- a/testing/resources/pixel/bug_491_unspecified.in
+++ b/testing/resources/pixel/bug_491_unspecified.in
@@ -66,9 +66,6 @@
 >>
 endobj
 {{xref}}
-trailer <<
-  /Size 9
-  /Root 1 0 R
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/pixel/bug_491_visible.in b/testing/resources/pixel/bug_491_visible.in
index 8e21b6c..1f5ab70 100644
--- a/testing/resources/pixel/bug_491_visible.in
+++ b/testing/resources/pixel/bug_491_visible.in
@@ -67,9 +67,6 @@
 >>
 endobj
 {{xref}}
-trailer <<
-  /Size 9
-  /Root 1 0 R
->>
+{{trailer}}
 {{startxref}}
 %%EOF
diff --git a/testing/resources/pixel/bug_733528.in b/testing/resources/pixel/bug_733528.in
index 3602c3f..ce2a3eb 100644
--- a/testing/resources/pixel/bug_733528.in
+++ b/testing/resources/pixel/bug_733528.in
@@ -64,9 +64,6 @@
 >>
 endobj
 {{xref}}
-trailer <<
-  /Root 1 0 R
-  /Size 10
->>
+{{trailer}}
 {{startxref}}
 %%EOF