Partial revert of 146621

Partial revert of 146621

The original patch introduced a crash (GetCompositor() can return NULL), but
reverting the whole thing is not possible without a lot of other reverts, and
the proper fix is fairly involve (likely not reasonable to patch to the branch).

This only reverts the problematic part, and a follow up will do a proper fix.

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

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

[sky, 2012-08-10 19:02:35]

LGTM

[commit-bot: I haz the power, 2012-08-10 22:24:56]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/10828262/1

[commit-bot: I haz the power, 2012-08-10 23:44:31]

Change committed as 151153

[commit-bot: I haz the power, 2012-08-11 01:25:01]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/piman@chromium.org/10828262/2002

[commit-bot: I haz the power, 2012-08-11 03:05:23]

Change committed as 151181