Integrate user strings into the JSON policy template file

tools/grit/grit/test_suite_all.py

Index: tools/grit/grit/test_suite_all.py
diff --git a/tools/grit/grit/test_suite_all.py b/tools/grit/grit/test_suite_all.py
index e6691d509dcfd506247deeeaa2000f7769f5071f..df11bf0e855d0b80746c9a1ff459347e52ef11c6 100644
--- a/tools/grit/grit/test_suite_all.py
+++ b/tools/grit/grit/test_suite_all.py
@@ -44,19 +44,9 @@ class TestSuiteAll(unittest.TestSuite):
     from grit.tool import postprocess_unittest
     from grit import shortcuts_unittests
     from grit.gather import muppet_strings_unittest
+    from grit.gather import policy_json_unittest
     from grit.node.custom import filename_unittest
     import grit.format.js_map_format_unittest
-    from grit.format.policy_templates import policy_template_generator_unittest
-    from grit.format.policy_templates.writers import plist_writer_unittest
-    from grit.format.policy_templates.writers \
-        import plist_strings_writer_unittest
-    from grit.format.policy_templates.writers \
-        import adm_writer_unittest
-    from grit.format.policy_templates.writers \
-        import adml_writer_unittest
-    from grit.format.policy_templates.writers \
-        import admx_writer_unittest
-    from grit.format.policy_templates.writers import doc_writer_unittest
 
     test_classes = [
       base_unittest.NodeUnittest,
@@ -86,13 +76,7 @@ class TestSuiteAll(unittest.TestSuite):
       muppet_strings_unittest.MuppetStringsUnittest,
       filename_unittest.WindowsFilenameUnittest,
       grit.format.js_map_format_unittest.JsMapFormatUnittest,
-      policy_template_generator_unittest.PolicyTemplateGeneratorUnittest,
-      plist_writer_unittest.PListWriterUnittest,
-      plist_strings_writer_unittest.PListStringsWriterUnittest,
-      adm_writer_unittest.AdmWriterUnittest,
-      admx_writer_unittest.AdmxWriterUnittest,
-      adml_writer_unittest.AdmlWriterUnittest,
-      doc_writer_unittest.DocWriterUnittest,
+      policy_json_unittest.PolicyJsonUnittest,
       # add test classes here...
     ]