Make browser tests for watchlist and history pass again

Follow up to I4496b596d3d16109baf5635b994e914d728c995b
which seems to have been a bad rebase

Browser tests are currently failing without these classes

Change-Id: Ib4dbf1926059743e8b6fd97a1b0b90b5879b18c3