Attempt to reland r173248,173259

Attempt to reland r173248,173259

They were reverted for two reasons.  1) GpuSideBlacklist test is broken in winbots.  It turns out the test is buggy, so I fixed the test in 173505

2) It broke official win build.  So I reverted part of the original CL that could cause the failure: move the AMDVideoCardType enum def back to gpu_info_collector.h, although for chromium build, it doesn't need to be in the .h file.

Hope this will make all bots (including official build) happe.

Original CL text:

Only collect GL/D3D context specific GPUInfo in GPU process

Instead of collecting full GPUInfo. Basic GPUInfo are already collected at Browser process startup time.

This avoids sandbox issue with libpci on linux. Also, it makes GPU startup faster.
 
BUG=162928, 165374
TEST=manual about:gpu
TBR=kbr
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=173533