Set and use /etc/iridium-browser in some more places

iridium-browser · Jan 4, 2022 · 27774a8 · 27774a8
1 parent 67ab173
commit 27774a8
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/chrome/browser/extensions/api/management/management_browsertest.cc b/chrome/browser/extensions/api/management/management_browsertest.cc
@@ -648,7 +648,7 @@ namespace {
 const char kForceInstallNotEmptyHelp[] =
     "A policy may already be controlling the list of force-installed "
     "extensions. Please remove all policy settings from your computer "
-    "before running tests. E.g. from /etc/chromium/policies Linux or "
+    "before running tests. E.g. from /etc/iridium-browser/policies Linux or "
     "from the registry on Windows, etc.";
 
 }

diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
@@ -429,9 +429,9 @@ bool PathProvider(int key, base::FilePath* result) {
 #if defined(OS_POSIX) && !defined(OS_MAC) && !defined(OS_OPENBSD)
     case chrome::DIR_POLICY_FILES: {
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-      cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+      cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/iridium-browser/policies"));
 #else
-      cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
+      cur = base::FilePath(FILE_PATH_LITERAL("/etc/iridium-browser/policies"));
 #endif
       break;
     }
@@ -510,7 +510,7 @@ bool PathProvider(int key, base::FilePath* result) {
           "/etc/opt/chrome/native-messaging-hosts"));
 #else
       cur = base::FilePath(FILE_PATH_LITERAL(
-          "/etc/chromium/native-messaging-hosts"));
+          "/etc/iridium-browser/native-messaging-hosts"));
 #endif
 #endif  // !defined(OS_MAC)
       break;

diff --git a/components/policy/tools/template_writers/writer_configuration.py b/components/policy/tools/template_writers/writer_configuration.py
@@ -63,7 +63,7 @@ def GetConfigurationForBuild(defines):
             },
         },
         'admx_prefix': 'chromium',
-        'linux_policy_path': '/etc/chromium/policies/',
+        'linux_policy_path': '/etc/iridium-browser/policies/',
         'bundle_id': 'org.chromium',
     }
   elif '_google_chrome' in defines:

diff --git a/headless/lib/browser/policy/headless_browser_policy_connector.cc b/headless/lib/browser/policy/headless_browser_policy_connector.cc
@@ -149,7 +149,7 @@ HeadlessBrowserPolicyConnector::CreatePlatformProvider() {
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
   base::FilePath config_dir_path(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
 #else
-  base::FilePath config_dir_path(FILE_PATH_LITERAL("/etc/chromium/policies"));
+  base::FilePath config_dir_path(FILE_PATH_LITERAL("/etc/iridium-browser/policies"));
 #endif
   std::unique_ptr<AsyncPolicyLoader> loader(new ConfigDirPolicyLoader(
       base::ThreadPool::CreateSequencedTaskRunner(