[Author: aharper]
[Author: aharper]

Fix Mac compilation when __IPHONE_OS_VERSION_MIN_REQUIRED and __IPHONE_2_0
are undefined (and thus iphone condition was always true).
Whitespace changes are just automatic cleanup in my editor.

R=dmaclach
APPROVED=dmaclach
DELTA=2  (1 added, 0 deleted, 1 changed)

git-svn-id: 741c308154f1e22deafec9707230e8b816ec4ca6@579 7dc7ac4e-7543-0410-b95c-c1676fc8e2a3

chao787/GTM-mirror,chao787/GTM-mirror,chao787/GTM-mirror