Added some missing includes, removed one include and removed an undef.

Added some missing includes, removed one include and removed an undef.

Found this when working on removing WebRTC's dependency on Chromium.

These updates makes the WebRTC Chromium FYI bots green.

BUG=468375
TBR=sergeyu@chromium.org,nick@chromium.org

Committed: https://crrev.com/cf1329463368a6268a492f57145f3c3c8d25c368
Cr-Commit-Position: refs/heads/master@{#349631}

[Henrik Grunell, 2015-09-17 16:18:08]

grunell@chromium.org changed reviewers:
+ sergeyu@chromium.org

[Henrik Grunell, 2015-09-17 16:18:50]

grunell@chromium.org changed reviewers:
+ bbudge@chromium.org

[Henrik Grunell, 2015-09-17 16:19:38]

grunell@chromium.org changed reviewers:
+ nick@chromium.org
- bbudge@chromium.org

[Henrik Grunell, 2015-09-17 16:20:22]

Nick: content/*
Sergey: the rest.

[Henrik Grunell, 2015-09-18 07:39:54]

On 2015/09/17 16:20:22, Henrik Grunell wrote:
> Nick: content/*
> Sergey: the rest.

I'm going to tbr this since it's required to keep WebRTC Chromium FYI bots green
and it's an include file addition/removal change only (plus one undef removal).

[Henrik Grunell, 2015-09-18 07:40:52]

The CQ bit was checked by grunell@chromium.org

[commit-bot: I haz the power, 2015-09-18 07:40:56]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1346883003/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1346883003/1

[commit-bot: I haz the power, 2015-09-18 08:17:50]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-09-18 08:18:35]

Patchset 1 (id:??) landed as
https://crrev.com/cf1329463368a6268a492f57145f3c3c8d25c368
Cr-Commit-Position: refs/heads/master@{#349631}