Chromium build fixes for C++ 17 warning and missing _remap_indexes

Use class instead of typename, move _remap_indexes out of #ifndef.

Fixes #2979
2 files changed