Merge "ContentHandlerTest: Use dataProvider"