fix content build on !linux && use_x11

fix content build on !linux && use_x11

link to -lXcomposite and add third_party/angle/include to
include_dirs because they are both needed in case X11 is used

BUG=
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=111393

[Robert Nagy, 2011-11-23 14:03:38]

I hope i've picked the right reviewers. Please review :)

[Mark Mentovai, 2011-11-23 14:18:24]

LGTM. No OWNERS required, so going right into the CQ.

[commit-bot: I haz the power, 2011-11-23 14:18:41]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/robert.nagy@gmail.com/8676009/1

[commit-bot: I haz the power, 2011-11-23 16:25:09]

Try job failure for 8676009-1 (retry) (retry) on mac_rel for step
"media_unittests".
It's a second try, previously, step "media_unittests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

[Robert Nagy, 2011-11-23 18:09:30]

On 2011/11/23 16:25:09, I haz the power (commit-bot) wrote:
> Try job failure for 8676009-1 (retry) (retry) on mac_rel for step
> "media_unittests".
> It's a second try, previously, step "media_unittests" failed.
>
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac_rel&nu...

I guess this is unrelated?

[commit-bot: I haz the power, 2011-11-23 18:14:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/robert.nagy@gmail.com/8676009/1

[commit-bot: I haz the power, 2011-11-23 19:49:32]

Change committed as 111393