Even more integration fixes.

Review URL: http://codereview.chromium.org/2849021
5 files changed