* For #4451: Adds tests for DefaultBrowserToolbarController * Continue working * Large refactoring of test * Mock analytics * Fix merge conflicts