Refactor service/lib to use artifacts.BundleImageZip

BUG=chromium:963208
TEST=manual, run_tests

Change-Id: Ide313bcb99ad97d4b8bd3fbd3e75615a388919d5
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1723825
Reviewed-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Michael Mortensen <mmortensen@google.com>
Tested-by: Michael Mortensen <mmortensen@google.com>
Commit-Queue: Michael Mortensen <mmortensen@google.com>
diff --git a/api/controller/artifacts_unittest.py b/api/controller/artifacts_unittest.py
index 012ae33..798120d 100644
--- a/api/controller/artifacts_unittest.py
+++ b/api/controller/artifacts_unittest.py
@@ -97,15 +97,15 @@
 
   def testBundleImageZip(self):
     """BundleImageZip calls cbuildbot/commands with correct args."""
-    build_image_zip = self.PatchObject(
-        commands, 'BuildImageZip', return_value='image.zip')
+    bundle_image_zip = self.PatchObject(
+        artifacts_svc, 'BundleImageZip', return_value='image.zip')
     self.PatchObject(os.path, 'exists', return_value=True)
     artifacts.BundleImageZip(self.input_proto, self.output_proto)
     self.assertEqual(
         [artifact.path for artifact in self.output_proto.artifacts],
         ['/tmp/artifacts/image.zip'])
     self.assertEqual(
-        build_image_zip.call_args_list,
+        bundle_image_zip.call_args_list,
         [mock.call('/tmp/artifacts', '/cros/src/build/images/target/latest')])
 
   def testBundleImageZipNoImageDir(self):