Minimal number of if-def changes to support OS_IOS in content_main_runner.cc

Minimal number of if-def changes to support OS_IOS in content_main_runner.cc

Revert "Revert 155980 - Minimal number of if-def changes to support OS_IOS in content_main_runner.cc" 

This reverts commit d582fbc2e6a6490096e3b5b6fcafbb228f90fcfe. 

The original CL had moved the initialization of the AtExitManager to within a non-Windows block. This moves it back down to where it was originally, adding a !OS_IOS to the !OS_ANDROID define. 

BUG=None


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

[leng, 2012-09-12 11:41:37]

Here's a version with a patch showing the diff between the original CL and the
fixed CL.

[jam, 2012-09-12 15:19:28]

lgtm

[commit-bot: I haz the power, 2012-09-12 15:20:17]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/leng@chromium.org/10915227/8001

[commit-bot: I haz the power, 2012-09-12 16:02:32]

Try job failure for 10915227-8001 (retry) on android for steps "compile, build"
(clobber build).
It's a second try, previously, steps "compile, build" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android&nu...

[commit-bot: I haz the power, 2012-09-13 07:50:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/leng@chromium.org/10915227/3006

[commit-bot: I haz the power, 2012-09-13 09:57:15]

Change committed as 156520