Use underscores to separate words in filenames in webkitpy.

third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/queries_unittest.py

 # Copyright (C) 2009 Google Inc. All rights reserved.
 # Copyright (C) 2012 Intel Corporation. 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
@@ skipping 12 matching lines @@
 # 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.
 
 import optparse
 import unittest
 
-from webkitpy.common.system.outputcapture import OutputCapture
+from webkitpy.common.system.output_capture import OutputCapture
 from webkitpy.tool.commands.queries import PrintBaselines, PrintExpectations
 from webkitpy.tool.mock_tool import MockWebKitPatch
 
 
 class PrintExpectationsTest(unittest.TestCase):
 
     def run_test(self, tests, expected_stdout, platform='test-win-win7', **kwargs):
         options_defaults = {
             'all': False, 'csv': False, 'full': False, 'platform': platform,
             'include_keyword': [], 'exclude_keyword': [], 'paths': False,
@@ skipping 121 matching lines @@
 
     def test_csv(self):
         command = PrintBaselines()
         self.capture_output()
         options = optparse.Values({'all': False, 'platform': '*win7', 'csv': True, 'include_virtual_tests': False})
         command.execute(options, ['passes/text.html'], self.tool)
         stdout, _, _ = self.restore_output()
         self.assertMultiLineEqual(stdout,
                                   ('test-win-win7,passes/text.html,None,png,passes/text-expected.png,None\n'
                                    'test-win-win7,passes/text.html,None,txt,passes/text-expected.txt,None\n'))