Update CPP test to use new APIs.

Change-Id: Ic4eff0e3c3dc826d1e0b5edbd7fe56dd335b8634
2 files changed