Web restrictions component.

components/components_tests.gyp

Index: components/components_tests.gyp
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 9ce4ac0e2f19f7d6f1fe3babd5cdb9926866e139..6014601c755142ca859c5c20e49313e113181628 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -865,6 +865,10 @@
       'web_resource/promo_resource_service_unittest.cc',
       'web_resource/resource_request_allowed_notifier_unittest.cc',
     ],
+    'web_restrictions_unittest_sources' : [
+      'web_restrictions/browser/web_restrictions_client_unittest.cc',
+      'web_restrictions/browser/web_restrictions_resource_throttle_unittest.cc',
+    ],
     'webcrypto_unittest_sources': [
       'webcrypto/algorithms/aes_cbc_unittest.cc',
       'webcrypto/algorithms/aes_ctr_unittest.cc',
@@ -1259,7 +1263,12 @@
           ],
           'conditions': [
             ['OS=="android"', {
+              'sources' : [
+                '<@(web_restrictions_unittest_sources)',
+              ],
               'dependencies': [
+                'components_java_test_stubs_jni_headers',
+                'components.gyp:web_restrictions_browser',
                 '../build/android/ndk.gyp:cpu_features',
               ],
             }],
@@ -1640,6 +1649,7 @@
           'isolate_file': 'components_unittests.isolate',
           'type': 'none',
           'dependencies': [
+            'components_java_test_stubs',
             'components_unittests',
             'components.gyp:invalidation_java',
             'components.gyp:signin_core_browser_java',
@@ -1666,11 +1676,36 @@
             'src_paths': [
               'invalidation/impl/android/junit/',
               'policy/android/junit/',
-              'web_restrictions/junit/'
+              'web_restrictions/browser/junit/'
             ],
           },
           'includes': [ '../build/host_jar.gypi' ],
         },
+        {
+          'target_name': 'components_java_test_stubs_jni_headers',

[Bernhard Bauer, 2016/02/22 12:39:16]

Nit: Usually these are called "test_support" and prefixed with the name of the
component, so it would be "web_restrictions_test_support_jni_headers" (I know,
quite a mouthful...)

[aberent, 2016/02/23 13:52:37]

Done. Also, for this to make sense, moved to web_restrictions.gypi, and made
similar name changes and moved components_java_test_stubs.

+          'type': 'none',
+          'sources': [
+            'web_restrictions/browser/javatest/src/org/chromium/components/webrestrictions/MockWebRestrictionsClient.java',
+          ],
+          'variables': {
+            'jni_gen_package': 'components/web_restrictions',
+          },
+          'includes': [ '../build/jni_generator.gypi' ],
+        },
+        {
+          'target_name': 'components_java_test_stubs',
+          'type': 'none',
+          'dependencies': [
+           'components.gyp:web_restrictions_java',
+             '../base/base.gyp:base_java',
+          ],
+          'variables': {
+            'java_in_dir': [
+               'web_restrictions/browser/javatest/'
+            ],
+          },
+          'includes': [ '../build/java.gypi' ],
+         }
       ],
       'conditions': [
         ['test_isolation_mode != "noop"',