Reland http://codereview.chromium.org/8233039/ with a fix
so that mac works.

[email protected]
BUG=90442
TEST=

Review URL: http://codereview.chromium.org/8276015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105439 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index c818460..7d28c2c 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -118,6 +118,7 @@
         '..',
       ],
       'sources': [
+        'app/startup_helper_win.cc',
         'shell/shell_main.cc',
       ],
       'msvs_settings': {
@@ -142,6 +143,11 @@
             },
           },
         }],
+        ['OS == "win" or (toolkit_uses_gtk == 1 and selinux == 0)', {
+          'dependencies': [
+            '../sandbox/sandbox.gyp:sandbox',
+          ],
+        }],
       ],
     },
   ],