Move tokenize_line method from TestExpectationParser to TestExpectationLine.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py

 # Copyright (C) 2012 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 10 matching lines @@
 # OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
 # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 # LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 # DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 from webkitpy.layout_tests.models import test_expectations
+from webkitpy.layout_tests.models.test_expectations import TestExpectations, TestExpectationLine
 
 from webkitpy.common.net.layouttestresults import LayoutTestResults
 
 
-TestExpectations = test_expectations.TestExpectations
-TestExpectationParser = test_expectations.TestExpectationParser
-
-
 class BuildBotPrinter(object):
     # This output is parsed by buildbots and must only be changed in coordination with buildbot scripts (see webkit.org's
     # Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg: RunWebKitTests._parseNewRunWebKitTestsOutput
     # and chromium.org's buildbot/master.chromium/scripts/master/log_parser/webkit_test_command.py).
 
     def __init__(self, stream, debug_logging):
         self.stream = stream
         self.debug_logging = debug_logging
 
     def print_results(self, run_details):
@@ skipping 89 matching lines @@
             for key, tests in flaky.iteritems():
                 result_type = TestExpectations.EXPECTATIONS[key.lower()]
                 self._print("Unexpected flakiness: %s (%d)" % (descriptions[result_type], len(tests)))
                 tests.sort()
 
                 for test in tests:
                     result = test_results.result_for_test(test)
                     actual = result.actual_results().split(" ")
                     expected = result.expected_results().split(" ")
                     # FIXME: clean this up once the old syntax is gone
-                    new_expectations_list = [TestExpectationParser._inverted_expectation_tokens[exp]
+                    new_expectations_list = [TestExpectationLine.inverted_expectation_tokens[exp]
                                              for exp in list(set(actual) | set(expected))]
                     self._print("  %s [ %s ]" % (test, " ".join(new_expectations_list)))
                 self._print("")
             self._print("")
 
         if len(regressions):
             descriptions = TestExpectations.EXPECTATION_DESCRIPTIONS
             for key, tests in regressions.iteritems():
                 result_type = TestExpectations.EXPECTATIONS[key.lower()]
                 self._print("Regressions: Unexpected %s (%d)" % (descriptions[result_type], len(tests)))
                 tests.sort()
                 for test in tests:
                     result = test_results.result_for_test(test)
                     actual = result.actual_results().split(" ")
                     expected = result.expected_results().split(" ")
-                    new_expectations_list = [TestExpectationParser._inverted_expectation_tokens[exp] for exp in actual]
+                    new_expectations_list = [TestExpectationLine.inverted_expectation_tokens[exp] for exp in actual]
                     self._print("  %s [ %s ]" % (test, " ".join(new_expectations_list)))
                 self._print("")
 
         if len(summarized_results['tests']) and self.debug_logging:
             self._print("%s" % ("-" * 78))