Revert all of the run-webkit-test wrapper changes from this weekend.

scripts/slave/recipe_modules/chromium_tests/steps.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 re
 import string
 
 
 class Test(object):
   """
@@ skipping 1680 matching lines @@
     if api.chromium.c.TARGET_PLATFORM == 'android':
       args.extend(['--platform', 'android'])
     if self._extra_args:
       args.extend(self._extra_args)
     if suffix == 'without patch':
       test_list = "\n".join(self.failures(api, 'with patch'))
       args.extend(['--test-list', api.raw_io.input(test_list),
                    '--skipped', 'always'])
 
     try:
-      if api.platform.is_win:
-        args[2] = '--results-directory'
-        args += [
-            '--master-name', api.properties['mastername'],
-            '--debug-rwt-logging',
-        ]
-        step_result = api.python(
-          step_name,
-          api.path['checkout'].join('third_party', 'WebKit', 'Tools',
-                                    'Scripts', 'run-webkit-tests'),
-          args,
-          step_test_data=lambda: api.test_utils.test_api.canned_test_output(
-              passing=True, minimal=True))
-      else:
-        step_result = api.chromium.runtest(
+      step_result = api.chromium.runtest(
           api.path['build'].join('scripts', 'slave', 'chromium',
                                  'layout_test_wrapper.py'),
           args, name=step_name,
           # TODO(phajdan.jr): Clean up the runtest.py mess.
           disable_src_side_runtest_py=True,
           step_test_data=lambda: api.test_utils.test_api.canned_test_output(
               passing=True, minimal=True))
 
       # Mark steps with unexpected flakes as warnings. Do this here instead of
       # "finally" blocks because we only want to do this if step was successful.
@@ skipping 135 matching lines @@
   def run(self, api, suffix, test_filter=None):
     api.chromium_android.coverage_report(upload=False)
     api.chromium_android.get_changed_lines_for_revision()
     api.chromium_android.incremental_coverage_report()
 
 
 GOMA_TESTS = [
   GTestTest('base_unittests'),
   GTestTest('content_unittests'),
 ]