Redefine --regulatory-label-dir flag

It turns out there is no easy way to overwrite the default directory of
regulatory labels (i.e. /usr/share/chromeos-assets/regulatory_labels)
without causing other problems (see the discussion in CL:1482597).

So let's limit the scope of this flag and only use it to pass per-model
'regulatory-label' property from cros_config.

Bug: 933173
Change-Id: I052a171bac74e02eb70e5c81c7027f6d15b7ad0b
Reviewed-on: https://chromium-review.googlesource.com/c/1484494
Commit-Queue: Philip Chen <philipchen@chromium.org>
Auto-Submit: Philip Chen <philipchen@chromium.org>
Reviewed-by: Michael Giuffrida <michaelpg@chromium.org>
Reviewed-by: Dan Erat <derat@chromium.org>
Cr-Commit-Position: refs/heads/master@{#634978}

chrome/browser/ui/webui/settings/about_handler.cc

@@ -80,8 +80,8 @@ namespace {
 
 #if defined(OS_CHROMEOS)
 
-// The default directory containing the regulatory labels for
-// supported regions, relative to chromeos-assets directory
+// The directory containing the regulatory labels for supported
+// models/regions, relative to chromeos-assets directory
 const char kRegulatoryLabelsDirectory[] = "regulatory_labels";
 
 // File names of the image file and the file containing alt text for the label.
@@ -165,30 +165,31 @@ bool CanChangeChannel(Profile* profile) {
   return service && service->IsOwner();
 }
 
-// Returns the absolute path to the directory of regulatory labels
-// for a given region, if found.
-// (e.g. "/usr/share/chromeos-assets/regulatory_labels/us".)
-// Must be called from the blocking pool.
+// Returns the relative path under the chromeos-assets dir
+// to the directory of regulatory labels for a given region, if found
+// (e.g. "regulatory_labels/us"). Must be called from the blocking pool.
 base::FilePath GetRegulatoryLabelDirForRegion(const std::string& region) {
-  // Allow the regulatory label path to be overriden by a flag.
-  base::FilePath base_dir =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+  base::FilePath region_path(kRegulatoryLabelsDirectory);
+  const std::string model_subdir =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           chromeos::switches::kRegulatoryLabelDir);
-  if (base_dir.empty()) {
-    base_dir = base::FilePath(chrome::kChromeOSAssetPath)
-                   .Append(kRegulatoryLabelsDirectory);
+  if (!model_subdir.empty()) {
+    region_path = region_path.AppendASCII(model_subdir);
   }
-  const base::FilePath region_dir = base_dir.AppendASCII(region);
-  const base::FilePath image_path =
-      region_dir.AppendASCII(kRegulatoryLabelImageFilename);
+  region_path = region_path.AppendASCII(region);
 
-  // Check if the label image file exists in the path.
-  return base::PathExists(image_path) ? region_dir : base::FilePath();
+  // Check if the label image file exists in the full path, e.g.,
+  // "/usr/share/chromeos-assets/regulatory_labels/us/label.png".
+  const base::FilePath image_path =
+      base::FilePath(chrome::kChromeOSAssetPath)
+          .Append(region_path)
+          .AppendASCII(kRegulatoryLabelImageFilename);
+  return base::PathExists(image_path) ? region_path : base::FilePath();
 }
 
-// Finds the absolute path to the directory of regulatory labels,
-// using the VPD region code. Also tries "us" as a fallback region.
-// Must be called from the blocking pool.
+// Finds the relative path under the chromeos-assets dir to the region
+// subdirectory of regulatory labels, using the VPD region code. Also
+// tries "us" as a fallback region. Must be called from the blocking pool.
 base::FilePath FindRegulatoryLabelDir() {
   std::string region;
   base::FilePath region_path;
@@ -206,12 +207,14 @@ base::FilePath FindRegulatoryLabelDir() {
   return region_path;
 }
 
-// Reads the file containing the regulatory label text, if found in
-// the given path to the directory of regulatory labels. Must be called
-// from the blocking pool.
+// Reads the file containing the regulatory label text, if found
+// in the given relative path under the chromeos-assets dir.
+// Must be called from the blocking pool.
 std::string ReadRegulatoryLabelText(const base::FilePath& label_dir_path) {
-  base::FilePath text_path =
-      label_dir_path.AppendASCII(kRegulatoryLabelTextFilename);
+  const base::FilePath text_path =
+      base::FilePath(chrome::kChromeOSAssetPath)
+          .Append(label_dir_path)
+          .AppendASCII(kRegulatoryLabelTextFilename);
 
   std::string contents;
   if (base::ReadFileToString(text_path, &contents))

chromeos/constants/chromeos_switches.cc

@@ -506,9 +506,10 @@ const char kShowAndroidFilesInFilesApp[] = "show-android-files-in-files-app";
 // If true, files in Android internal storage will be hidden in Files app.
 const char kHideAndroidFilesInFilesApp[] = "hide-android-files-in-files-app";
 
-// This directory contains per-region subdirectories with regulatory label
-// files. If this is not set, we fall back to the default directory
-// '/usr/share/chromeos-assets/regulatory_labels'
+// The name of the per-model directory which contains per-region
+// subdirectories with regulatory label files for this model.
+// The per-model directories (if there are any) are located under
+// "/usr/share/chromeos-assets/regulatory_labels/".
 const char kRegulatoryLabelDir[] = "regulatory-label-dir";
 
 // If true, the developer tool overlay will be shown for the login/lock screen.