[android] Use datatype as MIME type for archived test files.

Bug: 799921
Change-Id: Ie1a0773bc7ae23c141b170611ecc1d44acfcf45a
Reviewed-on: https://chromium-review.googlesource.com/966861Reviewed-by: Benjamin Pastene <bpastene@chromium.org>
Commit-Queue: John Budorick <jbudorick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543804}

build/android/pylib/base/output_manager.py

@@ -11,10 +11,10 @@ from devil.utils import reraiser_thread
 
 
 class Datatype(object):
-  HTML = 'html'
-  IMAGE = 'image'
-  TEXT = 'text'
-  JSON = 'json'
+  HTML = 'text/html'
+  JSON = 'application/json'
+  PNG = 'image/png'
+  TEXT = 'text/plain'
 
 
 class OutputManager(object):

build/android/pylib/local/device/local_device_instrumentation_test_run.py

@@ -538,7 +538,7 @@ class LocalDeviceInstrumentationTestRun(
       json_data = json.loads(device.ReadFile(json_path))
       image_file_path = posixpath.join(source_dir, json_data['location'])
       with self._env.output_manager.ArchivedTempfile(
-          json_data['location'], 'ui_capture', output_manager.Datatype.IMAGE
+          json_data['location'], 'ui_capture', output_manager.Datatype.PNG
           ) as image_archive:
         device.PullFile(image_file_path, image_archive.name)
       json_data['image_link'] = image_archive.Link()
@@ -764,7 +764,7 @@ class LocalDeviceInstrumentationTestRun(
       if device.FileExists(screenshot_device_file.name):
         with self._env.output_manager.ArchivedTempfile(
             screenshot_filename, 'screenshot',
-            output_manager.Datatype.IMAGE) as screenshot_host_file:
+            output_manager.Datatype.PNG) as screenshot_host_file:
           try:
             device.PullFile(screenshot_device_file.name,
                             screenshot_host_file.name)
@@ -791,7 +791,7 @@ class LocalDeviceInstrumentationTestRun(
 
       with self._env.output_manager.ArchivedTempfile(
           'fail_%s' % failure_filename, 'render_tests',
-          output_manager.Datatype.IMAGE) as failure_image_host_file:
+          output_manager.Datatype.PNG) as failure_image_host_file:
         device.PullFile(
             posixpath.join(failure_images_device_dir, failure_filename),
             failure_image_host_file.name)
@@ -802,7 +802,7 @@ class LocalDeviceInstrumentationTestRun(
       if device.PathExists(golden_image_device_file):
         with self._env.output_manager.ArchivedTempfile(
             'golden_%s' % failure_filename, 'render_tests',
-            output_manager.Datatype.IMAGE) as golden_image_host_file:
+            output_manager.Datatype.PNG) as golden_image_host_file:
           device.PullFile(
               golden_image_device_file, golden_image_host_file.name)
         golden_link = golden_image_host_file.Link()
@@ -814,7 +814,7 @@ class LocalDeviceInstrumentationTestRun(
       if device.PathExists(diff_image_device_file):
         with self._env.output_manager.ArchivedTempfile(
             'diff_%s' % failure_filename, 'render_tests',
-            output_manager.Datatype.IMAGE) as diff_image_host_file:
+            output_manager.Datatype.PNG) as diff_image_host_file:
           device.PullFile(
               diff_image_device_file, diff_image_host_file.name)
         diff_link = diff_image_host_file.Link()

build/android/pylib/output/remote_output_manager.py

@@ -66,7 +66,7 @@ class GoogleStorageArchivedFile(output_manager.ArchivedFile):
   def _PrepareArchive(self):
     self._content_addressed = (self._datatype in (
         output_manager.Datatype.HTML,
-        output_manager.Datatype.IMAGE,
+        output_manager.Datatype.PNG,
         output_manager.Datatype.JSON))
     if self._content_addressed:
       sha1 = hashlib.sha1()
@@ -85,10 +85,5 @@ class GoogleStorageArchivedFile(output_manager.ArchivedFile):
         google_storage_helper.exists(self._upload_path, self._bucket)):
       return
 
-    content_type = None
-    if self._datatype == output_manager.Datatype.HTML:
-      content_type = 'text/html'
-    elif self._datatype == output_manager.Datatype.JSON:
-      content_type = 'application/json'
     google_storage_helper.upload(
-        self._upload_path, self.name, self._bucket, content_type=content_type)
+        self._upload_path, self.name, self._bucket, content_type=self._datatype)