Make KioskExternalUpdater::ExternalUpdateErrorCode an enum class

This CL is part of the Chrome OS source code directory migration:
https://docs.google.com/document/d/1g-98HpzA8XcoGBWUv1gQNr4rbnD5yfvbtYZyPDDbkaE.

Bug: 1101837, 1164001
Change-Id: Ia0449cb26c992a3c410f0de71812185974c8ecff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2640234Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Henrique Ferreiro <hferreiro@igalia.com>
Cr-Commit-Position: refs/heads/master@{#845570}

chrome/browser/chromeos/app_mode/kiosk_external_updater.cc

@@ -33,11 +33,12 @@ constexpr char kExternalCrx[] = "external_crx";
 constexpr char kExternalVersion[] = "external_version";
 
 std::pair<std::unique_ptr<base::DictionaryValue>,
-          KioskExternalUpdater::ExternalUpdateErrorCode>
+          KioskExternalUpdater::ErrorCode>
 ParseExternalUpdateManifest(const base::FilePath& external_update_dir) {
   base::FilePath manifest = external_update_dir.Append(kExternalUpdateManifest);
   if (!base::PathExists(manifest)) {
-    return std::make_pair(nullptr, KioskExternalUpdater::ERROR_NO_MANIFEST);
+    return std::make_pair(nullptr,
+                          KioskExternalUpdater::ErrorCode::kNoManifest);
   }
 
   JSONFileValueDeserializer deserializer(manifest);
@@ -45,11 +46,11 @@ ParseExternalUpdateManifest(const base::FilePath& external_update_dir) {
       base::DictionaryValue::From(deserializer.Deserialize(nullptr, nullptr));
   if (!extensions) {
     return std::make_pair(nullptr,
-                          KioskExternalUpdater::ERROR_INVALID_MANIFEST);
+                          KioskExternalUpdater::ErrorCode::kInvalidManifest);
   }
 
   return std::make_pair(std::move(extensions),
-                        KioskExternalUpdater::ERROR_NONE);
+                        KioskExternalUpdater::ErrorCode::kNone);
 }
 
 // Copies |external_crx_file| to |temp_crx_file|, and removes |temp_dir|
@@ -202,12 +203,12 @@ void KioskExternalUpdater::ProcessParsedManifest(
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   const std::unique_ptr<base::DictionaryValue>& parsed_manifest = result.first;
-  ExternalUpdateErrorCode parsing_error = result.second;
-  if (parsing_error == ERROR_NO_MANIFEST) {
+  ErrorCode parsing_error = result.second;
+  if (parsing_error == ErrorCode::kNoManifest) {
     KioskAppManager::Get()->OnKioskAppExternalUpdateComplete(false);
     return;
   }
-  if (parsing_error == ERROR_INVALID_MANIFEST) {
+  if (parsing_error == ErrorCode::kInvalidManifest) {
     NotifyKioskUpdateProgress(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_KIOSK_EXTERNAL_UPDATE_INVALID_MANIFEST));

chrome/browser/chromeos/app_mode/kiosk_external_updater.h

@@ -26,10 +26,10 @@ class KioskExternalUpdateNotification;
 class KioskExternalUpdater : public disks::DiskMountManager::Observer,
                              public KioskExternalUpdateValidatorDelegate {
  public:
-  enum ExternalUpdateErrorCode {
-    ERROR_NONE,
-    ERROR_NO_MANIFEST,
-    ERROR_INVALID_MANIFEST,
+  enum class ErrorCode {
+    kNone,
+    kNoManifest,
+    kInvalidManifest,
   };
 
   KioskExternalUpdater(
@@ -69,10 +69,10 @@ class KioskExternalUpdater : public disks::DiskMountManager::Observer,
                                      const base::FilePath& temp_dir) override;
   void OnExternalUpdateUnpackFailure(const std::string& app_id) override;
 
-  // Processes the parsed external update manifest, check the
-  // ExternalUpdateErrorCode in |result| for any manifest parsing error.
-  using ParseManifestResult = std::pair<std::unique_ptr<base::DictionaryValue>,
-                                        ExternalUpdateErrorCode>;
+  // Processes the parsed external update manifest, check the ErrorCode in
+  // |result| for any manifest parsing error.
+  using ParseManifestResult =
+      std::pair<std::unique_ptr<base::DictionaryValue>, ErrorCode>;
   void ProcessParsedManifest(const base::FilePath& external_update_dir,
                              const ParseManifestResult& result);