Revert of Modifications to layout test framework so that it can work with browser_tests.

Tools/Scripts/webkitpy/layout_tests/port/factory.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 86 matching lines @@
         """Returns an object implementing the Port interface. If
         port_name is None, this routine attempts to guess at the most
         appropriate port on this platform."""
         port_name = port_name or self._default_port(options)
 
         # FIXME(steveblock): There's no longer any need to pass '--platform
         # chromium' on the command line so we can remove this logic.
         if port_name == 'chromium':
             port_name = self._host.platform.os_name
 
-        if 'browser_test' in port_name:
-            module_name, class_name = port_name.rsplit('.', 1)
+        for port_class in self.PORT_CLASSES:
+            module_name, class_name = port_class.rsplit('.', 1)
             module = __import__(module_name, globals(), locals(), [], -1)
-            port_class_name = module.get_port_class_name(class_name)
-            if port_class_name != None:
-                cls = module.__dict__[port_class_name]
-                port_name = cls.determine_full_port_name(self._host, options, class_name)
+            cls = module.__dict__[class_name]
+            if port_name.startswith(cls.port_name):
+                port_name = cls.determine_full_port_name(self._host, options, port_name)
                 return cls(self._host, port_name, options=options, **kwargs)
-        else:
-            for port_class in self.PORT_CLASSES:
-                module_name, class_name = port_class.rsplit('.', 1)
-                module = __import__(module_name, globals(), locals(), [], -1)
-                cls = module.__dict__[class_name]
-                if port_name.startswith(cls.port_name):
-                    port_name = cls.determine_full_port_name(self._host, options, port_name)
-                    return cls(self._host, port_name, options=options, **kwargs)
         raise NotImplementedError('unsupported platform: "%s"' % port_name)
 
     def all_port_names(self, platform=None):
         """Return a list of all valid, fully-specified, "real" port names.
 
         This is the list of directories that are used as actual baseline_paths()
         by real ports. This does not include any "fake" names like "test"
         or "mock-mac", and it does not include any directories that are not.
 
         If platform is not specified, we will glob-match all ports"""
         platform = platform or '*'
         return fnmatch.filter(builders.all_port_names(), platform)
 
     def get_from_builder_name(self, builder_name):
         port_name = builders.port_name_for_builder_name(builder_name)
         assert port_name, "unrecognized builder name '%s'" % builder_name
         return self.get(port_name, _builder_options(builder_name))