Small refactor to make GoogleOAuth2 more testable by extracting the dependency on WS
Fix warnings