Add 'lacros' enum to list of extension platforms.

This CL allows extensions to be marked as available on the 'lacros'
platform. This is primarily a small change to the generator python files
to accept a new enum type.

This CL marks enterprise.platformKeys as available on 'lacros' in order
to have real code using this logic path.

Change-Id: Icb593cb9fdd149154b7bd5d7206fad560ce82277
Bug: 1111879
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2333570
Auto-Submit: Erik Chen <erikchen@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#794821}

chrome/common/extensions/api/_features.md

@@ -312,8 +312,8 @@ The only accepted value is the bool `true`.
 The `platforms` property specifies the properties the feature should be
 available on.
 
-The accepted values are lists of strings from `chromeos`, `mac`, `linux`, and
-`win`.
+The accepted values are lists of strings from `chromeos`, `mac`, 'lacros',
+`linux`, and `win`.
 
 ### session\_types
 

chrome/common/extensions/api/enterprise_platform_keys.idl

@@ -7,7 +7,7 @@
 // certificates will be managed by the platform and can be used for TLS
 // authentication, network access or by other extension through
 // $(ref:platformKeys chrome.platformKeys).
-[platforms = ("chromeos")]
+[platforms = ("chromeos", "lacros")]
 namespace enterprise.platformKeys {
   [nocompile, noinline_doc] dictionary Token {
     // Uniquely identifies this <code>Token</code>.

extensions/common/BUILD.gn

@@ -334,6 +334,7 @@ if (enable_extensions) {
     deps = [
       "//base",
       "//build:branding_buildflags",
+      "//build:lacros_buildflags",
       "//components/crx_file",
       "//components/nacl/common:buildflags",
       "//components/url_formatter",

extensions/common/features/feature.cc

@@ -11,6 +11,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "build/build_config.h"
+#include "build/lacros_buildflags.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
 
@@ -18,7 +19,12 @@ namespace extensions {
 
 // static
 Feature::Platform Feature::GetCurrentPlatform() {
-#if defined(OS_CHROMEOS)
+// TODO(https://crbug.com/1052397): For readability, this should become
+// defined(OS_CHROMEOS) && BUILDFLAG(IS_LACROS). The second conditional should
+// be defined(OS_CHROMEOS) && BUILDFLAG(IS_ASH).
+#if BUILDFLAG(IS_LACROS)
+  return LACROS_PLATFORM;
+#elif defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)
   return CHROMEOS_PLATFORM;
 #elif defined(OS_LINUX)
   return LINUX_PLATFORM;

extensions/common/features/feature.h

@@ -46,6 +46,7 @@ class Feature {
   enum Platform {
     UNSPECIFIED_PLATFORM,
     CHROMEOS_PLATFORM,
+    LACROS_PLATFORM,
     LINUX_PLATFORM,
     MACOSX_PLATFORM,
     WIN_PLATFORM

tools/json_schema_compiler/cpp_bundle_generator.py

@@ -143,7 +143,13 @@ class CppBundleGenerator(object):
     ifdefs = []
     for platform in model_object.platforms:
       if platform == Platforms.CHROMEOS:
-        ifdefs.append('defined(OS_CHROMEOS)')
+        # TODO(https://crbug.com/1052397): For readability, this should become
+        # defined(OS_CHROMEOS) && BUILDFLAG(IS_ASH).
+        ifdefs.append('(defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS))')
+      elif platform == Platforms.LACROS:
+        # TODO(https://crbug.com/1052397): For readability, this should become
+        # defined(OS_CHROMEOS) && BUILDFLAG(IS_LACROS).
+        ifdefs.append('BUILDFLAG(IS_LACROS)')
       elif platform == Platforms.LINUX:
         ifdefs.append('(defined(OS_LINUX) && !defined(OS_CHROMEOS))')
       elif platform == Platforms.MAC:
@@ -252,6 +258,9 @@ class _APICCGenerator(object):
         os.path.join(self._bundle._impl_dir,
                      'generated_api_registration.h')))
     c.Append()
+    c.Append('#include "build/build_config.h"')
+    c.Append('#include "build/lacros_buildflags.h"')
+    c.Append()
     for namespace in self._bundle._model.namespaces.values():
       namespace_name = namespace.unix_name.replace("experimental_", "")
       implementation_header = namespace.compiler_options.get(

tools/json_schema_compiler/cpp_bundle_generator_test.py

@@ -36,15 +36,15 @@ class CppBundleGeneratorTest(unittest.TestCase):
         'test/function_platform_all.json')
     self.assertEquals(
         'defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || '
-        'defined(OS_CHROMEOS)',
+        '(defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS))',
         _getPlatformIfdefs(cpp_bundle_generator, model))
 
   def testIfDefsForChromeOS(self):
     cpp_bundle_generator, model = _createCppBundleGenerator(
         'test/function_platform_chromeos.json')
-    self.assertEquals(
-        'defined(OS_CHROMEOS)',
-        _getPlatformIfdefs(cpp_bundle_generator, model))
+    self.assertEquals('(defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS))',
+                      _getPlatformIfdefs(cpp_bundle_generator, model))
+
 
 if __name__ == '__main__':
   unittest.main()

tools/json_schema_compiler/feature_compiler.py

@@ -240,6 +240,7 @@ FEATURE_GRAMMAR = ({
         list: {
             'enum_map': {
                 'chromeos': 'Feature::CHROMEOS_PLATFORM',
+                'lacros': 'Feature::LACROS_PLATFORM',
                 'linux': 'Feature::LINUX_PLATFORM',
                 'mac': 'Feature::MACOSX_PLATFORM',
                 'win': 'Feature::WIN_PLATFORM',

tools/json_schema_compiler/model.py

@@ -605,6 +605,7 @@ class Platforms(object):
   """
   CHROMEOS = _PlatformInfo("chromeos")
   CHROMEOS_TOUCH = _PlatformInfo("chromeos_touch")
+  LACROS = _PlatformInfo("lacros")
   LINUX = _PlatformInfo("linux")
   MAC = _PlatformInfo("mac")
   WIN = _PlatformInfo("win")