Fix lint errors in chromium_android.py and chromium_android_unittest.py

Tools/Scripts/webkitpy/layout_tests/port/chromium_android_unittest.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 24 matching lines @@
 from webkitpy.common.system import executive_mock
 from webkitpy.common.system.executive_mock import MockExecutive2
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
 from webkitpy.layout_tests.port import chromium_android
 from webkitpy.layout_tests.port import chromium_port_testcase
 from webkitpy.layout_tests.port import driver
 from webkitpy.layout_tests.port import driver_unittest
 from webkitpy.tool.mocktool import MockOptions
 
+
 # Any "adb" commands will be interpret by this class instead of executing actual
 # commansd on the file system, which we don't want to do.
 class MockAndroidDebugBridge:
     def __init__(self, device_count):
         self._device_count = device_count
         self._last_command = None
 
     # Local public methods.
 
     def run_command(self, args):
@@ skipping 21 matching lines @@
     def last_command(self):
         return self._last_command
 
     # Local private methods.
 
     def _get_device_output(self):
         serials = ['123456789ABCDEF0', '123456789ABCDEF1', '123456789ABCDEF2',
                    '123456789ABCDEF3', '123456789ABCDEF4', '123456789ABCDEF5']
         output = 'List of devices attached\n'
         for serial in serials[:self._device_count]:
-          output += '%s\tdevice\n' % serial
+            output += '%s\tdevice\n' % serial
         return output
 
 
 class AndroidCommandsTest(unittest.TestCase):
     def setUp(self):
         chromium_android.AndroidCommands._adb_command_path = None
         chromium_android.AndroidCommands._adb_command_path_options = ['adb']
 
     def make_executive(self, device_count):
         self._mock_executive = MockAndroidDebugBridge(device_count)
@@ skipping 113 matching lines @@
         mock_adb = MockAndroidDebugBridge(2)
         mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
 
         port0 = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive),
             'chromium-android', options=MockOptions(additional_drt_flag=['--foo=bar']))
         port1 = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive),
             'chromium-android', options=MockOptions(driver_name='content_shell'))
 
         self.assertEqual(1, port0.driver_cmd_line().count('--foo=bar'))
         self.assertEqual(0, port1.driver_cmd_line().count('--create-stdin-fifo'))
-
-
-class ChromiumAndroidTwoPortsTest(unittest.TestCase):
-    # Test that the driver's command line indeed goes through to the driver.
-    def test_options_with_two_ports(self):
-        mock_adb = MockAndroidDebugBridge(2)
-        mock_executive = MockExecutive2(run_command_fn=mock_adb.run_command)
-
-        port0 = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive),
-            'chromium-android', options=MockOptions(additional_drt_flag=['--foo=bar']))
-        port1 = chromium_android.ChromiumAndroidPort(MockSystemHost(executive=mock_executive),
-            'chromium-android', options=MockOptions(driver_name='content_shell'))
-
-        self.assertEqual(1, port0.driver_cmd_line().count('--foo=bar'))
-        self.assertEqual(0, port1.driver_cmd_line().count('--create-stdin-fifo'))