Cleanup after enabling WPTServe.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py

Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
index f52c30fa86fc82e98aa037dcb95976e23ca74996..ef62e807f288f4d51d1ca50b30d716fdb515c3f0 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py
@@ -169,7 +169,6 @@ class Port(object):
 
         self._http_server = None
         self._websocket_server = None
-        self._is_wptserve_enabled = getattr(options, 'enable_wptserve', False)
         self._wpt_server = None
         self._image_differ = None
         self.server_process_constructor = server_process.ServerProcess  # overridable for testing
@@ -1147,17 +1146,13 @@ class Port(object):
         server.start()
         self._websocket_server = server
 
-    def is_wptserve_enabled(self):
-        """Used as feature flag for WPT Serve feature."""
-        return self._is_wptserve_enabled
-
     @staticmethod
     def is_wptserve_test(test):
         """Whether wptserve should be used for a given test if enabled."""
         return test.startswith("external/wpt/")
 
     def should_use_wptserve(self, test):
-        return self.is_wptserve_enabled() and self.is_wptserve_test(test)
+        return self.is_wptserve_test(test)
 
     def start_wptserve(self):
         """Start a WPT web server. Raise an error if it can't start or is already running.
@@ -1165,7 +1160,6 @@ class Port(object):
         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_wptserve_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())
@@ -1321,8 +1315,6 @@ class Port(object):
             self._filesystem.join(self.layout_tests_dir(), 'StaleTestExpectations'),
             self._filesystem.join(self.layout_tests_dir(), 'SlowTests'),
         ]
-        if self.is_wptserve_enabled():
-            paths.append(self._filesystem.join(self.layout_tests_dir(), 'WPTServeExpectations'))
         paths.extend(self._flag_specific_expectations_files())
         return paths