Revert 120106 - Cleanup: Merge some OS specific sections in chrome/*.gypi.

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi	(revision 120106)
+++ chrome/chrome_exe.gypi	(working copy)
@@ -162,29 +162,6 @@
             'app/chrome_main_delegate.h',
           ],
         }],
-        ['OS=="linux"', {
-          'conditions': [
-            ['branding=="Chrome"', {
-              'dependencies': [
-                'linux_installer_configs',
-              ],
-            }],
-            ['selinux==0', {
-              'dependencies': [
-                '../sandbox/sandbox.gyp:sandbox',
-              ],
-            }],
-            # For now, do not build nacl_helper when disable_nacl=1
-            # or when arm is enabled
-            # http://code.google.com/p/gyp/issues/detail?id=239
-            ['disable_nacl==0 and target_arch!="arm"', {
-              'dependencies': [
-                '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
-                'nacl_helper',
-                ],
-            }],
-          ],
-        }],
         ['OS=="mac"', {
           # 'branding' is a variable defined in common.gypi
           # (e.g. "Chromium", "Chrome")
@@ -264,9 +241,6 @@
             'CHROMIUM_SHORT_NAME': '<(branding)',
           },
           'dependencies': [
-            # On Mac, make sure we've built chrome_dll, which contains all of
-            # the library code with Chromium functionality.
-            'chrome_dll',
             'helper_app',
             'infoplist_strings_tool',
             'interpose_dependency_shim',
@@ -407,8 +381,23 @@
               ],
             },
           ],  # postbuilds
-        }, {  # OS != "mac"
+        }],
+        ['OS=="linux"', {
           'conditions': [
+            ['branding=="Chrome"', {
+              'dependencies': [
+                'linux_installer_configs',
+              ],
+            }],
+            ['selinux==0', {
+              'dependencies': [
+                '../sandbox/sandbox.gyp:sandbox',
+              ],
+            }],
+          ],
+        }],
+        ['OS != "mac"', {
+          'conditions': [
             # TODO:  add a:
             #   'product_name': 'chromium'
             # whenever we convert the rest of the infrastructure
@@ -433,6 +422,26 @@
             '../third_party/adobe/flash/flash_player.gyp:flash_player',
           ],
         }],
+        ['OS=="linux"', {
+          'conditions': [
+            # For now, do not build nacl_helper when disable_nacl=1
+            # or when arm is enabled
+            # http://code.google.com/p/gyp/issues/detail?id=239
+            ['disable_nacl==0 and target_arch!="arm"', {
+              'dependencies': [
+                '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
+                'nacl_helper',
+                ],
+            }],
+          ],
+        }],
+        ['OS=="mac"', {
+          'dependencies': [
+            # On Mac, make sure we've built chrome_dll, which contains all of
+            # the library code with Chromium functionality.
+            'chrome_dll',
+          ],
+        }],
         ['OS=="mac" and asan==1', {
           'xcode_settings': {
             # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE.