Revert of components: Fix 'gn check' errors for omnibox.

Revert of components: Fix 'gn check' errors for omnibox. (patchset #2 id:20001 of https://codereview.chromium.org/1232343006/)

Reason for revert:
This CL causes the Windows GN build to fail.
Sample failure at
http://build.chromium.org/p/chromium.win/builders/Win8%20GN%20%28dbg%29/builds/9607/steps/compile/logs/stdio

Original issue's description:
> components: Fix 'gn check' errors for omnibox.
>
> Tested on Linux with the following command lines:
>
> $ gn gen out-gn/Release --args='is_debug=false is_component_build=false symbol_level=1'
> $ gn check out-gn/Release //components/omnibox/*
>
> BUG=367595, 376000
> TEST=see above
> R=brettw@chromium.org,pkasting@chromium.org,skuhne@chromium.org
> TBR=brettw@chromium.org
>
> Committed: https://crrev.com/fc240d37b0b23e1284ed943ea2a0830464190e20
> Cr-Commit-Position: refs/heads/master@{#339156}

TBR=brettw@chromium.org,pkasting@chromium.org,skuhne@chromium.org,tfarina@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=367595, 376000
Committed: https://crrev.com/cc83d2d66b34ea56edba30cd90538fc1a3343e4f
Cr-Commit-Position: refs/heads/master@{#339276}

[kelvinp, 2015-07-17 17:13:08]

Created Revert of components: Fix 'gn check' errors for omnibox.

[commit-bot: I haz the power, 2015-07-17 17:13:46]

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

[commit-bot: I haz the power, 2015-07-17 17:15:24]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-07-17 17:16:12]

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