[BrowserTest] refactor for alphabetization and space only

preliminary to updating Then statements to RSpec3.0 syntax

zero change to function or syntax, just arranging things so
we can review them later.

Change-Id: Id0f006d0fcf74010c06cb7ae6386ea6bcaff0e55
Merge "[BrowserTest] refactor for alphabetization and space only"