[Android] Implement generic JSON results that match base/test/launcher.

build/android/pylib/results/flakiness_dashboard/results_uploader.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Uploads the results to the flakiness dashboard server."""
 # pylint: disable=E1002,R0201
 
 import logging
 import os
 import shutil
 import tempfile
 import xml
 
 
-#TODO(craigdh): pylib/utils/ should not depend on pylib/.
 from pylib import cmd_helper
 from pylib import constants
-from pylib.utils import json_results_generator
+from pylib.results.flakiness_dashboard import json_results_generator
 from pylib.utils import repo_utils
 
 
 
 class JSONResultsGenerator(json_results_generator.JSONResultsGeneratorBase):
   """Writes test results to a JSON file and handles uploading that file to
   the test results server.
   """
   def __init__(self, builder_name, build_name, build_number, tmp_folder,
                test_results_map, test_results_server, test_type, master_name):
@@ skipping 141 matching lines @@
   """Reports test results to the flakiness dashboard for Chrome for Android.
 
   Args:
     results: test results.
     flakiness_dashboard_server: the server to upload the results to.
     test_type: the type of the tests (as displayed by the flakiness dashboard).
   """
   uploader = ResultsUploader(test_type)
   uploader.AddResults(results)
   uploader.Upload(flakiness_dashboard_server)