[BrowserTest] consolidate some duplicate elements

and remove one unused

Change-Id: Ica50cf74edd9a21423800a7d58f4832b77a7e8bc
Merge "[BrowserTest] consolidate some duplicate elements"