clean up test importer to use webkit_finder and update tests

Tools/Scripts/webkitpy/w3c/test_importer.py

 #!/usr/bin/env python
 
 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the above
 #    copyright notice, this list of conditions and the following
@@ skipping 79 matching lines @@
 
 import datetime
 import logging
 import mimetypes
 import optparse
 import os
 import shutil
 import sys
 
 from webkitpy.common.host import Host
+from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.common.system.executive import ScriptError
 from webkitpy.w3c.test_parser import TestParser
 from webkitpy.w3c.test_converter import W3CTestConverter
 
 
 TEST_STATUS_UNKNOWN = 'unknown'
 TEST_STATUS_APPROVED = 'approved'
 TEST_STATUS_SUBMITTED = 'submitted'
 
 CHANGESET_NOT_AVAILABLE = 'Not Available'
@@ skipping 55 matching lines @@
 
 class TestImporter(object):
 
     def __init__(self, host, source_directory, repo_dir, options):
         self.host = host
         self.source_directory = source_directory
         self.options = options
 
         self.filesystem = self.host.filesystem
 
-        self._webkit_root = __file__.split(self.filesystem.sep + 'Tools')[0]
+        webkit_finder = WebKitFinder(self.filesystem)
+        self._webkit_root = webkit_finder.webkit_base()
         self.repo_dir = repo_dir
         subdirs = os.path.dirname(os.path.relpath(source_directory, repo_dir))
 
-        self.destination_directory = os.path.join(self.path_from_webkit_root("LayoutTests"), 'w3c', subdirs)
+        self.destination_directory = webkit_finder.path_from_webkit_base("LayoutTests", 'w3c', *subdirs)
 
         self.changeset = CHANGESET_NOT_AVAILABLE
         self.test_status = TEST_STATUS_UNKNOWN
 
         self.import_list = []
 
-    def path_from_webkit_root(self, *comps):
-        return self.filesystem.abspath(self.filesystem.join(self._webkit_root, *comps))
-
     def do_import(self):
         self.find_importable_tests(self.source_directory)
         self.load_changeset()
         self.import_tests()
 
     def load_changeset(self):
         """Returns the current changeset from mercurial or "Not Available"."""
         try:
             self.changeset = self.host.executive.run_command(['hg', 'tip']).split('changeset:')[1]
         except (OSError, ScriptError):
@@ skipping 243 matching lines @@
             for prop in prop_list:
                 import_log.write(prop + '\n')
         else:
             import_log.write('None\n')
         import_log.write('------------------------------------------------------------------------\n')
         import_log.write('List of files:\n')
         for item in file_list:
             import_log.write(item + '\n')
 
         import_log.close()