Do not use underscores for members of VmInfo structure

Members of a struct are publicly accessible and therefore should not
end with an underscore.

Bug: 1071872
Change-Id: Icd6a4db3952df9e6c7efe172f0d638e9944bb81b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2306550Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Commit-Queue: Dmitry Torokhov <dtor@chromium.org>
Cr-Commit-Position: refs/heads/master@{#789847}

chrome/browser/chromeos/dbus/vm/vm_permission_service_provider.cc

@@ -52,10 +52,12 @@ base::UnguessableToken TokenFromString(const std::string& str) {
 
 namespace chromeos {
 
-VmPermissionServiceProvider::VmInfo::VmInfo(std::string owner_id,
-                                            std::string name,
-                                            VmType type)
-    : owner_id_(std::move(owner_id)), name_(std::move(name)), type_(type) {}
+VmPermissionServiceProvider::VmInfo::VmInfo(std::string vm_owner_id,
+                                            std::string vm_name,
+                                            VmType vm_type)
+    : owner_id(std::move(vm_owner_id)),
+      name(std::move(vm_name)),
+      type(vm_type) {}
 
 VmPermissionServiceProvider::VmInfo::~VmInfo() = default;
 
@@ -67,7 +69,7 @@ VmPermissionServiceProvider::VmMap::iterator
 VmPermissionServiceProvider::FindVm(const std::string& owner_id,
                                     const std::string& name) {
   return std::find_if(vms_.begin(), vms_.end(), [&](const auto& vm) {
-    return vm.second->owner_id_ == owner_id && vm.second->name_ == name;
+    return vm.second->owner_id == owner_id && vm.second->name == name;
   });
 }
 
@@ -226,7 +228,7 @@ void VmPermissionServiceProvider::SetPermissions(
   }
 
   base::flat_map<VmInfo::PermissionType, bool> new_permissions(
-      iter->second->permissions_);
+      iter->second->permission_to_enabled_map);
   for (const auto& p : request.permissions()) {
     VmInfo::PermissionType kind;
     if (p.kind() == vm_permission_service::Permission::CAMERA) {
@@ -246,7 +248,7 @@ void VmPermissionServiceProvider::SetPermissions(
   }
 
   // Commit final version of permissions.
-  iter->second->permissions_ = std::move(new_permissions);
+  iter->second->permission_to_enabled_map = std::move(new_permissions);
 
   std::move(response_sender).Run(std::move(response));
 }
@@ -288,7 +290,7 @@ void VmPermissionServiceProvider::GetPermissions(
   }
 
   vm_permission_service::GetPermissionsResponse payload;
-  for (auto permission : iter->second->permissions_) {
+  for (auto permission : iter->second->permission_to_enabled_map) {
     auto* p = payload.add_permissions();
     switch (permission.first) {
       case VmInfo::PermissionCamera:
@@ -307,8 +309,8 @@ void VmPermissionServiceProvider::GetPermissions(
 }
 
 void VmPermissionServiceProvider::UpdateVmPermissions(VmInfo* vm) {
-  vm->permissions_.clear();
-  switch (vm->type_) {
+  vm->permission_to_enabled_map.clear();
+  switch (vm->type) {
     case VmInfo::PluginVm:
       UpdatePluginVmPermissions(vm);
       break;
@@ -320,7 +322,7 @@ void VmPermissionServiceProvider::UpdateVmPermissions(VmInfo* vm) {
 void VmPermissionServiceProvider::UpdatePluginVmPermissions(VmInfo* vm) {
   Profile* profile = ProfileManager::GetPrimaryUserProfile();
   if (!profile || chromeos::ProfileHelper::GetUserIdHashFromProfile(profile) !=
-                      vm->owner_id_) {
+                      vm->owner_id) {
     return;
   }
 
@@ -330,14 +332,14 @@ void VmPermissionServiceProvider::UpdatePluginVmPermissions(VmInfo* vm) {
   if (base::FeatureList::IsEnabled(
           chromeos::features::kPluginVmShowCameraPermissions) &&
       prefs->GetBoolean(prefs::kVideoCaptureAllowed)) {
-    vm->permissions_[VmInfo::PermissionCamera] =
+    vm->permission_to_enabled_map[VmInfo::PermissionCamera] =
         PluginVmManager->GetPermission(plugin_vm::PermissionType::kCamera);
   }
 
   if (base::FeatureList::IsEnabled(
           chromeos::features::kPluginVmShowMicrophonePermissions) &&
       prefs->GetBoolean(prefs::kAudioCaptureAllowed)) {
-    vm->permissions_[VmInfo::PermissionMicrophone] =
+    vm->permission_to_enabled_map[VmInfo::PermissionMicrophone] =
         PluginVmManager->GetPermission(plugin_vm::PermissionType::kMicrophone);
   }
 }

chrome/browser/chromeos/dbus/vm/vm_permission_service_provider.h

@@ -107,11 +107,11 @@ class VmPermissionServiceProvider
     enum VmType { CrostiniVm = 0, PluginVm = 1 };
     enum PermissionType { PermissionCamera = 0, PermissionMicrophone = 1 };
 
-    const std::string owner_id_;
-    const std::string name_;
-    const VmType type_;
+    const std::string owner_id;
+    const std::string name;
+    const VmType type;
 
-    base::flat_map<PermissionType, bool> permissions_;
+    base::flat_map<PermissionType, bool> permission_to_enabled_map;
 
     VmInfo(std::string owner_id, std::string name, VmType type);
     ~VmInfo();