arc: Use arcvm-post-vm-start-services to control jobs

BUG=b:171408795
TEST=Launch Play Store

Change-Id: I350bb9e05ecbd168a6452e76b59b601a27db8dc8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560534Reviewed-by: Yusuke Sato <yusukes@chromium.org>
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#833139}

components/arc/session/arc_vm_client_adapter.cc

@@ -62,14 +62,14 @@ namespace {
 // The "_2d" in job names below corresponds to "-". Upstart escapes characters
 // that aren't valid in D-Bus object paths with underscore followed by its
 // ascii code in hex. So "arc_2dcreate_2ddata" becomes "arc-create-data".
-constexpr const char kArcVmAdbdJobName[] = "arcvm_2dadbd";
 constexpr const char kArcVmPerBoardFeaturesJobName[] =
     "arcvm_2dper_2dboard_2dfeatures";
-// TODO(hashimoto): Introduce another job for post-vm-start services.
 constexpr char kArcVmPreLoginServicesJobName[] =
     "arcvm_2dpre_2dlogin_2dservices";
 constexpr char kArcVmPostLoginServicesJobName[] =
     "arcvm_2dpost_2dlogin_2dservices";
+constexpr char kArcVmPostVmStartServicesJobName[] =
+    "arcvm_2dpost_2dvm_2dstart_2dservices";
 
 constexpr const char kCrosSystemPath[] = "/usr/bin/crossystem";
 constexpr const char kArcVmBootNotificationServerSocketPath[] =
@@ -653,6 +653,8 @@ class ArcVmClientAdapter : public ArcClientAdapter,
         // exist.
         JobDesc{kArcVmPerBoardFeaturesJobName, UpstartOperation::JOB_START, {}},
 
+        JobDesc{
+            kArcVmPostVmStartServicesJobName, UpstartOperation::JOB_STOP, {}},
         JobDesc{kArcVmPostLoginServicesJobName, UpstartOperation::JOB_STOP, {}},
         JobDesc{kArcVmPreLoginServicesJobName,
                 UpstartOperation::JOB_STOP_AND_START,
@@ -830,20 +832,16 @@ class ArcVmClientAdapter : public ArcClientAdapter,
     current_cid_ = response.vm_info().cid();
     VLOG(1) << "ARCVM started cid=" << current_cid_;
 
-    if (!should_start_adbd) {
-      // No need to start arcvm-adbd. Run the |callback| now.
-      std::move(callback).Run(true);
-      return;
+    VLOG(1) << "Starting arcvm-post-vm-start-services.";
+    std::vector<std::string> environment;
+    if (should_start_adbd) {
+      environment.push_back("SERIALNUMBER=" + serial_number_);
+      environment.push_back(
+          base::StringPrintf("ARCVM_CID=%" PRId64, current_cid_));
     }
-
-    // Start the daemon for supporting adb-over-usb.
-    VLOG(1) << "Starting arcvm-adbd";
-    std::vector<std::string> environment_for_adbd = {
-        "SERIALNUMBER=" + serial_number_,
-        base::StringPrintf("ARCVM_CID=%" PRId64, current_cid_)};
-    std::deque<JobDesc> jobs{JobDesc{kArcVmAdbdJobName,
-                                     UpstartOperation::JOB_STOP_AND_START,
-                                     std::move(environment_for_adbd)}};
+    std::deque<JobDesc> jobs{JobDesc{kArcVmPostVmStartServicesJobName,
+                                     UpstartOperation::JOB_START,
+                                     std::move(environment)}};
     ConfigureUpstartJobs(
         std::move(jobs),
         base::BindOnce(&ArcVmClientAdapter::OnConfigureUpstartJobsAfterVmStart,

components/arc/session/arc_vm_client_adapter_unittest.cc

@@ -44,7 +44,6 @@
 namespace arc {
 namespace {
 
-constexpr const char kArcVmAdbdJobName[] = "arcvm_2dadbd";
 constexpr const char kArcVmPerBoardFeaturesJobName[] =
     "arcvm_2dper_2dboard_2dfeatures";
 constexpr const size_t kUnixMaxPathLen = sizeof(sockaddr_un::sun_path);
@@ -54,6 +53,8 @@ constexpr char kArcVmPreLoginServicesJobName[] =
     "arcvm_2dpre_2dlogin_2dservices";
 constexpr char kArcVmPostLoginServicesJobName[] =
     "arcvm_2dpost_2dlogin_2dservices";
+constexpr char kArcVmPostVmStartServicesJobName[] =
+    "arcvm_2dpost_2dvm_2dstart_2dservices";
 
 constexpr const char kUserIdHash[] = "this_is_a_valid_user_id_hash";
 constexpr const char kSerialNumber[] = "AAAABBBBCCCCDDDD1234";
@@ -762,14 +763,14 @@ TEST_F(ArcVmClientAdapterTest, UpgradeArc_StartArcVmPostLoginServicesFailure) {
   EXPECT_TRUE(arc_instance_stopped_called());
 }
 
-// Tests that UpgradeArc() handles arcvm-adbd stop failures properly.
-// Note that arcvm-adbd is restarted AFTER ARCVM is started.
-TEST_F(ArcVmClientAdapterTest, UpgradeArc_StopArcVmAdbdFailure) {
+// Tests that UpgradeArc() handles arcvm-post-vm-start-services stop failures
+// properly.
+TEST_F(ArcVmClientAdapterTest, UpgradeArc_StopArcVmPostVmStartServicesFailure) {
   SetValidUserInfo();
   StartMiniArc();
 
   // Inject failure to FakeUpstartClient.
-  InjectUpstartStopJobFailure(kArcVmAdbdJobName);
+  InjectUpstartStopJobFailure(kArcVmPostVmStartServicesJobName);
 
   // Upgrade should still succeed.
   UpgradeArc(true);
@@ -780,14 +781,15 @@ TEST_F(ArcVmClientAdapterTest, UpgradeArc_StopArcVmAdbdFailure) {
   EXPECT_FALSE(GetTestConciergeClient()->stop_vm_called());
 }
 
-// Tests that UpgradeArc() handles arcvm-adbd startup failures properly.
-// Note that arcvm-adbd is restarted AFTER ARCVM is started.
-TEST_F(ArcVmClientAdapterTest, UpgradeArc_StartArcVmAdbdFailure) {
+// Tests that UpgradeArc() handles arcvm-post-vm-start-services startup failures
+// properly.
+TEST_F(ArcVmClientAdapterTest,
+       UpgradeArc_StartArcVmPostVmStartServicesFailure) {
   SetValidUserInfo();
   StartMiniArc();
 
   // Inject failure to FakeUpstartClient.
-  InjectUpstartStartJobFailure(kArcVmAdbdJobName);
+  InjectUpstartStartJobFailure(kArcVmPostVmStartServicesJobName);
 
   EnableAdbOverUsbForTesting();
   UpgradeArc(false);