In a closely-battled contest, Federer overcame a wobble in the third set to win the match against British 29th seed Cameron Norrie.