Merge to XFA: Clean up misc nits found while fixing bugs.

Merge to XFA: Clean up misc nits found while fixing bugs.

Some bits regressed in commit 338805f.

Also merge: IWYU fix after commit c5a8933.

R=tsepez@chromium.org
TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1544963002 .
Review URL: https://codereview.chromium.org/1570973002 .

(cherry picked from commit c5a8933f260ca1034fde902058442984e55c0f7a)
(cherry picked from commit e6bd31873c3dba3f79c5ebbbefed636948629cc9)

Committed: https://pdfium.googlesource.com/pdfium/+/1b97664bc5b84c7a2b87cc656f8c6a0476f9b71f

[Lei Zhang, 2016-01-08 22:23:13]

Description was changed from

==========
Merge to XFA: Clean up misc nits found while fixing bugs.

Some bits regressed in commit 338805f.

Also merge: IWYU fix after commit c5a8933.

Review URL: https://codereview.chromium.org/1544963002 .
Review URL: https://codereview.chromium.org/1570973002 .

(cherry picked from commit c5a8933f260ca1034fde902058442984e55c0f7a)
(cherry picked from commit e6bd31873c3dba3f79c5ebbbefed636948629cc9)
==========

to

==========
Merge to XFA: Clean up misc nits found while fixing bugs.

Some bits regressed in commit 338805f.

Also merge: IWYU fix after commit c5a8933.

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1544963002 .
Review URL: https://codereview.chromium.org/1570973002 .

(cherry picked from commit c5a8933f260ca1034fde902058442984e55c0f7a)
(cherry picked from commit e6bd31873c3dba3f79c5ebbbefed636948629cc9)
==========

[Lei Zhang, 2016-01-08 22:23:36]

thestig@chromium.org changed reviewers:
+ tsepez@chromium.org

[Lei Zhang, 2016-01-08 22:23:36]

TBR

Trivial conflicts in fpdfsdk/include/fsdk_baseform.h and
fpdfsdk/src/fsdk_baseform.cpp.

[Tom Sepez, 2016-01-08 22:24:22]

lgtm

[Lei Zhang, 2016-01-08 22:24:43]

Description was changed from

==========
Merge to XFA: Clean up misc nits found while fixing bugs.

Some bits regressed in commit 338805f.

Also merge: IWYU fix after commit c5a8933.

TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1544963002 .
Review URL: https://codereview.chromium.org/1570973002 .

(cherry picked from commit c5a8933f260ca1034fde902058442984e55c0f7a)
(cherry picked from commit e6bd31873c3dba3f79c5ebbbefed636948629cc9)
==========

to

==========
Merge to XFA: Clean up misc nits found while fixing bugs.

Some bits regressed in commit 338805f.

Also merge: IWYU fix after commit c5a8933.

R=tsepez@chromium.org
TBR=tsepez@chromium.org

Review URL: https://codereview.chromium.org/1544963002 .
Review URL: https://codereview.chromium.org/1570973002 .

(cherry picked from commit c5a8933f260ca1034fde902058442984e55c0f7a)
(cherry picked from commit e6bd31873c3dba3f79c5ebbbefed636948629cc9)

Committed:
https://pdfium.googlesource.com/pdfium/+/1b97664bc5b84c7a2b87cc656f8c6a0476f9...
==========

[Lei Zhang, 2016-01-08 22:24:45]

Committed patchset #1 (id:1) manually as
1b97664bc5b84c7a2b87cc656f8c6a0476f9b71f (presubmit successful).