telemetry: Fix killing the perf profiler

build/android/pylib/monkey/test_runner.py

 # Copyright 2013 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.
 
 """Runs a monkey test on a single device."""
 
 import logging
 import random
 
 from pylib import constants
@@ skipping 48 matching lines @@
                       action='android.intent.action.MAIN'),
         blocking=True, force_stop=True)
 
     # Chrome crashes are not always caught by Monkey test runner.
     # Verify Chrome has the same PID before and after the test.
     before_pids = self.device.GetPids(self._package)
 
     # Run the test.
     output = ''
     if before_pids:
+      if len(before_pids[self._package]) > 1:

[jbudorick, 2015/07/27 15:25:32]

This should probably be before_pids.get(self._package, [])

[Sami, 2015/07/27 15:33:23]

Done.

+        raise Exception(
+            'At most one instance of process %s expected but found pids: '
+            '%s' % (self._package, before_pids))
       output = '\n'.join(self._LaunchMonkeyTest())
       after_pids = self.device.GetPids(self._package)
 
     crashed = True
     if not self._package in before_pids:
       logging.error('Failed to start the process.')
     elif not self._package in after_pids:
       logging.error('Process %s has died.', before_pids[self._package])
     elif before_pids[self._package] != after_pids[self._package]:
       logging.error('Detected process restart %s -> %s',
@@ skipping 18 matching lines @@
             activity='%s.crash.MinidumpUploadService' % _CHROME_PACKAGE)
         try:
           self.device.RunShellCommand(
               ['am', 'startservice'] + minidump_intent.am_args,
               as_root=True, check_return=True)
         except device_errors.CommandFailedError:
           logging.exception('Failed to start MinidumpUploadService')
 
     results.AddResult(result)
     return results, False