Revert of [Android][telemetry] Break logging deadlock when attempting to log an AppCrashException.

tools/telemetry/telemetry/internal/story_runner_unittest.py

 # Copyright 2014 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.
 
 import os
 import StringIO
 import sys
 import unittest
 
 from catapult_base import cloud_storage
@@ skipping 333 matching lines @@
     self.RunStoryTest(story_set2, 27)
     AssertAndCleanUpFoo()
     self.assertEquals(0, barz_init_call_counter[0])
     self.assertEquals(0, barz_tear_down_call_counter[0])
 
   def testAppCrashExceptionCausesFailureValue(self):
     self.SuppressExceptionFormatting()
     story_set = story_module.StorySet()
     class SharedStoryThatCausesAppCrash(TestSharedPageState):
       def WillRunStory(self, story):
-        raise exceptions.AppCrashException(msg='App Foo crashes')
+        raise exceptions.AppCrashException('App Foo crashes')
 
     story_set.AddStory(DummyLocalStory(
           SharedStoryThatCausesAppCrash))
     story_runner.Run(
         DummyTest(), story_set, self.options, self.results)
     self.assertEquals(1, len(self.results.failures))
     self.assertEquals(0, GetNumberOfSuccessfulPageRuns(self.results))
     self.assertIn('App Foo crashes', self.fake_stdout.getvalue())
 
   def testUnknownExceptionIsFatal(self):
@@ skipping 37 matching lines @@
 
     class Test(page_test.PageTest):
       def __init__(self, *args):
         super(Test, self).__init__(*args)
         self.run_count = 0
 
       def RunPage(self, *_):
         old_run_count = self.run_count
         self.run_count += 1
         if old_run_count == 0:
-          raise exceptions.BrowserGoneException(
-              None, 'i am a browser crash message')
+          raise exceptions.BrowserGoneException('i am a browser instance')
 
       def ValidateAndMeasurePage(self, page, tab, results):
         pass
 
     story_set.AddStory(DummyLocalStory(TestSharedPageState))
     story_set.AddStory(DummyLocalStory(TestSharedPageState))
     test = Test()
     story_runner.Run(
         test, story_set, self.options, self.results)
     self.assertEquals(2, test.run_count)
@@ skipping 229 matching lines @@
         num_failing_stories=5, runner_max_failures=3,
         options_max_failures=None, expected_num_failures=4)
 
   def testMaxFailuresOption(self):
     # Runs up to max_failures+1 failing tests before stopping, since
     # every tests after max_failures failures have been encountered
     # may all be passing.
     self._testMaxFailuresOptionIsRespectedAndOverridable(
         num_failing_stories=5, runner_max_failures=3,
         options_max_failures=1, expected_num_failures=2)