Instrumented libraries: merge chromeos=1 and chromeos=0 package lists.

third_party/instrumented_libraries/instrumented_libraries.gyp

Index: third_party/instrumented_libraries/instrumented_libraries.gyp
diff --git a/third_party/instrumented_libraries/instrumented_libraries.gyp b/third_party/instrumented_libraries/instrumented_libraries.gyp
index ea0c65950321d2841a8ccc71811838796db9dc63..e860a57533984cdfb96c7e5ed2704539c981e535 100644
--- a/third_party/instrumented_libraries/instrumented_libraries.gyp
+++ b/third_party/instrumented_libraries/instrumented_libraries.gyp
@@ -207,6 +207,8 @@
         '<(_sanitizer_type)-libunity9',
         '<(_sanitizer_type)-dee',
         '<(_sanitizer_type)-libpixman-1-0',
+        '<(_sanitizer_type)-brltty',
+        '<(_sanitizer_type)-libva1',
       ],
       'conditions': [
         ['"<(_ubuntu_release)"=="precise"', {
@@ -231,12 +233,6 @@
             '<(_sanitizer_type)-libpng12-0',
           ],
         }],
-        ['chromeos==1', {
-          'dependencies': [
-            '<(_sanitizer_type)-brltty',
-            '<(_sanitizer_type)-libva1',
-          ],
-        }]
       ],
       'direct_dependent_settings': {
         'target_conditions': [