Update Port.is_wpt_test to check for wpt instead of web-platform-tests.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.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 1152 matching lines @@
         server = pywebsocket.PyWebSocket(self, self.results_directory())
         server.start()
         self._websocket_server = server
 
     def is_wpt_enabled(self):
         """Used as feature flag for WPT Serve feature."""
         return self._is_wpt_enabled
 
     def is_wpt_test(self, test):
         """Whether this test is part of a web-platform-tests which require wptserve servers."""
-        return "web-platform-tests" in test
+        return test.startswith("imported/wpt/")
 
     def start_wptserve(self):
         """Start a WPT web server. Raise an error if it can't start or is already running.
 
         Ports can stub this out if they don't need a WPT web server to be running."""
         assert not self._wpt_server, 'Already running an http server.'
         assert self.is_wpt_enabled(), 'Cannot start server if WPT is not enabled.'
 
         # We currently don't support any output mechanism for the WPT server.
         server = wptserve.WPTServe(self, self.results_directory())
@@ skipping 600 matching lines @@
 
     def __init__(self, base, args, reference_args=None):
         self.name = base
         self.base = base
         self.args = args
         self.reference_args = args if reference_args is None else reference_args
         self.tests = set()
 
     def __repr__(self):
         return "PhysicalTestSuite('%s', '%s', %s, %s)" % (self.name, self.base, self.args, self.reference_args)