arcvm: Rename arc_vm_client_adapter_util* to arc_property_util*

This allows us to use the property expantion function in non-VM
ARC code paths.

BUG=b:144199481
TEST=try, no real code change

Change-Id: Iab5a1b8bb6a3ed8d8dbf9d4c7fe598356b47f593
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2024149
Commit-Queue: Yusuke Sato <yusukes@chromium.org>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735665}

components/arc/BUILD.gn

@@ -210,6 +210,8 @@ static_library("arc_base") {
     "session/arc_container_client_adapter.h",
     "session/arc_data_remover.cc",
     "session/arc_data_remover.h",
+    "session/arc_property_util.cc",
+    "session/arc_property_util.h",
     "session/arc_session.cc",
     "session/arc_session.h",
     "session/arc_session_impl.cc",
@@ -222,8 +224,6 @@ static_library("arc_base") {
     "session/arc_upgrade_params.h",
     "session/arc_vm_client_adapter.cc",
     "session/arc_vm_client_adapter.h",
-    "session/arc_vm_client_adapter_util.cc",
-    "session/arc_vm_client_adapter_util.h",
     "session/file_system_status.cc",
     "session/file_system_status.h",
   ]
@@ -368,10 +368,10 @@ source_set("unit_tests") {
     "power/arc_power_bridge_unittest.cc",
     "property/arc_property_bridge_unittest.cc",
     "session/arc_data_remover_unittest.cc",
+    "session/arc_property_util_unittest.cc",
     "session/arc_session_impl_unittest.cc",
     "session/arc_session_runner_unittest.cc",
     "session/arc_vm_client_adapter_unittest.cc",
-    "session/arc_vm_client_adapter_util_unittest.cc",
     "session/file_system_status_unittest.cc",
     "timer/arc_timer_bridge_unittest.cc",
     "video_accelerator/arc_video_accelerator_util_unittest.cc",

components/arc/session/arc_vm_client_adapter_util.cc → components/arc/session/arc_property_util.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/arc/session/arc_vm_client_adapter_util.h"
+#include "components/arc/session/arc_property_util.h"
 
 #include <algorithm>
 #include <vector>

components/arc/session/arc_vm_client_adapter_util.h → components/arc/session/arc_property_util.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_ARC_SESSION_ARC_VM_CLIENT_ADAPTER_UTIL_H_
-#define COMPONENTS_ARC_SESSION_ARC_VM_CLIENT_ADAPTER_UTIL_H_
+#ifndef COMPONENTS_ARC_SESSION_ARC_PROPERTY_UTIL_H_
+#define COMPONENTS_ARC_SESSION_ARC_PROPERTY_UTIL_H_
 
 #include <string>
 
@@ -46,4 +46,4 @@ bool ExpandPropertyFile(const base::FilePath& input,
 
 }  // namespace arc
 
-#endif  // COMPONENTS_ARC_SESSION_ARC_VM_CLIENT_ADAPTER_UTIL_H_
+#endif  // COMPONENTS_ARC_SESSION_ARC_PROPERTY_UTIL_H_

components/arc/session/arc_vm_client_adapter_util_unittest.cc → components/arc/session/arc_property_util_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/arc/session/arc_vm_client_adapter_util.h"
+#include "components/arc/session/arc_property_util.h"
 
 #include <memory>
 

components/arc/session/file_system_status.cc

@@ -16,7 +16,7 @@
 #include "base/threading/scoped_blocking_call.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "components/arc/session/arc_vm_client_adapter_util.h"
+#include "components/arc/session/arc_property_util.h"
 
 namespace arc {
 namespace {