Revert 95907 - Clean up SSL false start blacklist code. Numerous changes, including:

build/linux/system.gyp

Index: build/linux/system.gyp
===================================================================
--- build/linux/system.gyp	(revision 96390)
+++ build/linux/system.gyp	(working copy)
@@ -31,7 +31,6 @@
     {
       'target_name': 'gtk',
       'type': 'settings',
-      'toolsets': ['host', 'target'],
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
@@ -47,27 +46,12 @@
               '<!@(<(pkg-config) --libs-only-l gtk+-2.0 gthread-2.0)',
             ],
           },
-        }, {
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(pkg-config --cflags gtk+-2.0 gthread-2.0)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(pkg-config --libs-only-L --libs-only-other gtk+-2.0 gthread-2.0)',
-            ],
-            'libraries': [
-              '<!@(pkg-config --libs-only-l gtk+-2.0 gthread-2.0)',
-            ],
-          },
-        }],
-        ['chromeos==1', {
-          'link_settings': {
-            'libraries': [ '-lXtst' ]
-          }
-        }],
-      ],
+      }],
+      [ 'chromeos==1', {
+        'link_settings': {
+          'libraries': [ '-lXtst' ]
+        }
+      }]]
     },
     {
       'target_name': 'gtkprint',
@@ -87,8 +71,7 @@
               '<!@(<(pkg-config) --libs-only-l gtk+-unix-print-2.0)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'ssl',
@@ -169,8 +152,7 @@
               '<!@(<(pkg-config) --libs-only-l freetype2)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'fontconfig',
@@ -190,8 +172,7 @@
               '<!@(<(pkg-config) --libs-only-l fontconfig)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'gdk',
@@ -211,8 +192,7 @@
               '<!@(<(pkg-config) --libs-only-l gdk-2.0)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'gconf',
@@ -235,8 +215,7 @@
               '<!@(<(pkg-config) --libs-only-l gconf-2.0)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'gio',
@@ -271,13 +250,11 @@
               }],
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'x11',
       'type': 'settings',
-      'toolsets': ['host', 'target'],
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
@@ -293,21 +270,7 @@
               '<!@(<(pkg-config) --libs-only-l x11 xi)',
             ],
           },
-        }, {
-          'direct_dependent_settings': {
-            'cflags': [
-              '<!@(pkg-config --cflags x11)',
-            ],
-          },
-          'link_settings': {
-            'ldflags': [
-              '<!@(pkg-config --libs-only-L --libs-only-other x11 xi)',
-            ],
-            'libraries': [
-              '<!@(pkg-config --libs-only-l x11 xi)',
-            ],
-          },
-        }],
+      }],
       ],
     },
     {
@@ -328,8 +291,7 @@
               '<!@(<(pkg-config) --libs-only-l xext)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'libgcrypt',
@@ -346,8 +308,7 @@
               '<!@(libgcrypt-config --libs)',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'selinux',
@@ -359,8 +320,7 @@
               '-lselinux',
             ],
           },
-        }],
-      ],
+      }]]
     },
     {
       'target_name': 'gnome_keyring',