Remove some dead and duplicate code that broke some jumbo builds

Some test code was compiled into chrome which in jumbo builds
broke the linking. In non-jumbo builds the code was probably
eliminated by the implicit dead-code-removal in the linker
(an .o file that is completely unused is ignored).

Also changing an #include "foo.cpp" to #include "foo.h" since that
caused similar linking errors related to duplicate code.

Change-Id: I6c39314fadc3a82f48135755cc7de1a540006ae5
Reviewed-by: James MacLean <>
Reviewed-by: Jialiu Lin <>
Reviewed-by: Fady Samuel <>
Commit-Queue: Daniel Bratell <>
Cr-Commit-Position: refs/heads/master@{#589863}
3 files changed