Add nacl_loader_unittests to the chromium_builder_tests

components/nacl.gyp

Index: components/nacl.gyp
diff --git a/components/nacl.gyp b/components/nacl.gyp
index 883db8b39c860a4061ce88537bd8d780fd685625..4218a42cd8f0ad91a314910d5f6f90011f843d1c 100644
--- a/components/nacl.gyp
+++ b/components/nacl.gyp
@@ -184,7 +184,33 @@
               '<@(nacl_defines)',
             ],
           },
-        }
+        },
+        {
+          'target_name': 'nacl_loader_unittests',
+          'type': '<(gtest_target_type)',
+          'sources': [
+            'nacl/loader/run_all_unittests.cc',
+          ],
+          'dependencies': [
+            'nacl',
+            '../base/base.gyp:test_support_base',
+            '../testing/gtest.gyp:gtest',
+          ],
+          'conditions': [
+            ['OS=="linux"', {
+              'sources': [
+                # TODO(hamaji): Currently, we build them twice. Stop building
+                # them for components_unittests. See crbug.com/364751
+                'nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc',
+                'nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc',
+              ],
+              'dependencies': [
+                'nacl_linux',
+                '../sandbox/sandbox.gyp:sandbox_linux_test_utils',
+              ],
+            }],
+          ],
+        },
       ],
       'conditions': [
         ['OS=="linux"', {
@@ -200,7 +226,7 @@
                 'nacl/loader/nacl_helper_linux.h',
               ],
               'dependencies': [
-                'nacl_loader',
+                'nacl_linux',
               ],
               'cflags': ['-fPIE'],
               'ldflags!': [
@@ -213,7 +239,7 @@
                 'ldflags': ['-pie'],
               },
             }, {
-              'target_name': 'nacl_loader',
+              'target_name': 'nacl_linux',
               'type': 'static_library',
               'include_dirs': [
                 '..',
@@ -290,22 +316,6 @@
                 }],
               ],
               'cflags': ['-fPIE'],
-            }, {
-              'target_name': 'nacl_loader_unittests',
-              'type': '<(gtest_target_type)',
-              'sources': [
-                # TODO(hamaji): Currently, we build them twice. Stop building
-                # them for components_unittests. See crbug.com/364751
-                'nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc',
-                'nacl/loader/nonsfi/nonsfi_sandbox_sigsys_unittest.cc',
-                'nacl/loader/run_all_unittests.cc',
-              ],
-              'dependencies': [
-                'nacl_loader',
-                '../base/base.gyp:test_support_base',
-                '../sandbox/sandbox.gyp:sandbox_linux_test_utils',
-                '../testing/gtest.gyp:gtest',
-              ],
             },
           ],
         }],