GitLab

- Add missing includes
- Inline function.


BUG=63656
TEST=HostContentSettingsMapTest*, 
     ContentSettingsProviderTest*


Review URL: http://codereview.chromium.org/8804016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113610 0039d316-1c4b-4281-b951-d872f2087c98