Commit 2eecbe2b authored by Yuta Hijikata's avatar Yuta Hijikata Committed by Chromium LUCI CQ

Lacros: Rename deprecated macro and gn variable names.

The change replaces deprecated variable names is_lacros and
IS_LACROS with is_chromeos_lacros and IS_CHROMEOS_LACROS.

Bug: 1052397
Change-Id: I9d4664ed4f9ef0b95a43e51183f92a29fd0a5040
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2623611Reviewed-by: default avatarDavid Benjamin <davidben@chromium.org>
Commit-Queue: Yuta Hijikata <ythjkt@chromium.org>
Cr-Commit-Position: refs/heads/master@{#842895}
parent 45cd7073
......@@ -121,7 +121,7 @@ component("crypto") {
sources += [ "nss_util_chromeos.cc" ]
}
if (is_chromeos || is_lacros) {
if (is_chromeos || is_chromeos_lacros) {
sources += [
"chaps_support.cc",
"chaps_support.h",
......
......@@ -35,7 +35,7 @@ namespace crypto {
namespace {
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LACROS)
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
// Fake certificate authority database used for testing.
static const base::FilePath::CharType kReadOnlyCertDB[] =
......@@ -59,7 +59,7 @@ base::FilePath GetDefaultConfigDirectory() {
return dir;
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LACROS)
#endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
// On non-Chrome OS platforms, return the default config directory. On Chrome OS
// test images, return a read-only directory with fake root CA certs (which are
......@@ -67,7 +67,7 @@ base::FilePath GetDefaultConfigDirectory() {
// code). On Chrome OS non-test images (where the read-only directory doesn't
// exist), return an empty path.
base::FilePath GetInitialConfigDirectory() {
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LACROS)
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
base::FilePath database_dir = base::FilePath(kReadOnlyCertDB);
if (!base::PathExists(database_dir))
database_dir.clear();
......@@ -160,7 +160,7 @@ class NSSInitSingleton {
// Use "sql:" which can be shared by multiple processes safely.
std::string nss_config_dir =
base::StringPrintf("sql:%s", database_dir.value().c_str());
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LACROS)
#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
status = NSS_Init(nss_config_dir.c_str());
#else
status = NSS_InitReadWrite(nss_config_dir.c_str());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment