assistant: update AppStatus enum name

Bug: None
Change-Id: I906c85c64f30e3bce4782225cf52c5a25cf470eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2268458Reviewed-by: David Black <dmblack@google.com>
Commit-Queue: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/heads/master@{#783048}

chrome/browser/ui/ash/assistant/device_actions.cc

@@ -177,7 +177,7 @@ void DeviceActions::SetSwitchAccessEnabled(bool enabled) {
 
 bool DeviceActions::OpenAndroidApp(const AndroidAppInfo& app_info) {
   auto status = delegate_->GetAndroidAppStatus(app_info.package_name);
-  if (status != AppStatus::AVAILABLE)
+  if (status != AppStatus::kAvailable)
     return false;
 
   auto* app = ARC_GET_INSTANCE_FOR_METHOD(
@@ -230,7 +230,7 @@ void DeviceActions::RemoveAppListEventSubscriber(
 base::Optional<std::string> DeviceActions::GetAndroidAppLaunchIntent(
     const AndroidAppInfo& app_info) {
   auto status = delegate_->GetAndroidAppStatus(app_info.package_name);
-  if (status != AppStatus::AVAILABLE)
+  if (status != AppStatus::kAvailable)
     return base::nullopt;
 
   return GetLaunchIntent(std::move(app_info));

chrome/browser/ui/ash/assistant/device_actions_delegate_impl.cc

@@ -20,9 +20,9 @@ AppStatus DeviceActionsDelegateImpl::GetAndroidAppStatus(
       ArcAppListPrefs::Get(ProfileManager::GetActiveUserProfile());
   if (!prefs) {
     LOG(ERROR) << "ArcAppListPrefs is not available.";
-    return AppStatus::UNKNOWN;
+    return AppStatus::kUnknown;
   }
   std::string app_id = prefs->GetAppIdByPackageName(package_name);
 
-  return app_id.empty() ? AppStatus::UNAVAILABLE : AppStatus::AVAILABLE;
+  return app_id.empty() ? AppStatus::kUnavailable : AppStatus::kAvailable;
 }

chrome/browser/ui/ash/assistant/device_actions_unittest.cc

@@ -31,8 +31,8 @@ constexpr char kUnregisteredAppName[] = "unregistered_app_name";
 
 class FakeDeviceActionsDelegate : public DeviceActionsDelegate {
   AppStatus GetAndroidAppStatus(const std::string& package_name) override {
-    return apps_.find(package_name) != apps_.end() ? AppStatus::AVAILABLE
-                                                   : AppStatus::UNAVAILABLE;
+    return apps_.find(package_name) != apps_.end() ? AppStatus::kAvailable
+                                                   : AppStatus::kUnavailable;
   }
 
  private:
@@ -71,18 +71,18 @@ class DeviceActionsTest : public ChromeAshTestBase {
 };
 
 TEST_F(DeviceActionsTest, RegisteredAppShouldBeAvailable) {
-  ASSERT_EQ(GetAppStatus(kRegisteredAppName), AppStatus::AVAILABLE);
+  ASSERT_EQ(GetAppStatus(kRegisteredAppName), AppStatus::kAvailable);
 }
 
 TEST_F(DeviceActionsTest, UnregisteredAppShouldBeUnavailable) {
-  ASSERT_EQ(GetAppStatus(kUnregisteredAppName), AppStatus::UNAVAILABLE);
+  ASSERT_EQ(GetAppStatus(kUnregisteredAppName), AppStatus::kUnavailable);
 }
 
 TEST_F(DeviceActionsTest, UnknownAppShouldBeUnknown) {
 }
 
 TEST_F(DeviceActionsTest, MultipleAppsShouldBeVerifiedCorrectly) {
-  ASSERT_EQ(GetAppStatus(kRegisteredAppName), AppStatus::AVAILABLE);
-  ASSERT_EQ(GetAppStatus(kUnregisteredAppName), AppStatus::UNAVAILABLE);
-  ASSERT_EQ(GetAppStatus(kOtherRegisteredAppName), AppStatus::AVAILABLE);
+  ASSERT_EQ(GetAppStatus(kRegisteredAppName), AppStatus::kAvailable);
+  ASSERT_EQ(GetAppStatus(kUnregisteredAppName), AppStatus::kUnavailable);
+  ASSERT_EQ(GetAppStatus(kOtherRegisteredAppName), AppStatus::kAvailable);
 }

chromeos/services/assistant/assistant_manager_service_impl.cc

@@ -98,15 +98,15 @@ constexpr char kAndroidSettingsAppPackage[] = "com.android.settings";
 
 action::AppStatus GetActionAppStatus(AppStatus status) {
   switch (status) {
-    case AppStatus::UNKNOWN:
+    case AppStatus::kUnknown:
       return action::UNKNOWN;
-    case AppStatus::AVAILABLE:
+    case AppStatus::kAvailable:
       return action::AVAILABLE;
-    case AppStatus::UNAVAILABLE:
+    case AppStatus::kUnavailable:
       return action::UNAVAILABLE;
-    case AppStatus::VERSION_MISMATCH:
+    case AppStatus::kVersionMismatch:
       return action::VERSION_MISMATCH;
-    case AppStatus::DISABLED:
+    case AppStatus::kDisabled:
       return action::DISABLED;
   }
 }

chromeos/services/assistant/public/cpp/assistant_service.h

@@ -113,13 +113,12 @@ struct COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) AssistantSuggestion {
 };
 
 // Models status of an app.
-// TODO(xiaohuic): update to constant style naming.
 enum class AppStatus {
-  UNKNOWN,
-  AVAILABLE,
-  UNAVAILABLE,
-  VERSION_MISMATCH,
-  DISABLED
+  kUnknown,
+  kAvailable,
+  kUnavailable,
+  kVersionMismatch,
+  kDisabled,
 };
 
 // Models an Android app.
@@ -144,7 +143,7 @@ struct COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) AndroidAppInfo {
   std::string intent;
 
   // Status of the app.
-  AppStatus status{AppStatus::UNKNOWN};
+  AppStatus status{AppStatus::kUnknown};
 
   // The general action to be performed, such as ACTION_VIEW, ACTION_MAIN, etc.
   std::string action;

chromeos/services/assistant/test_support/scoped_device_actions.cc

@@ -20,7 +20,7 @@ bool ScopedDeviceActions::OpenAndroidApp(const AndroidAppInfo& app_info) {
 
 AppStatus ScopedDeviceActions::GetAndroidAppStatus(
     const AndroidAppInfo& app_info) {
-  return AppStatus::AVAILABLE;
+  return AppStatus::kAvailable;
 }
 
 }  // namespace assistant