Rename chromium-android port to android

Tools/Scripts/webkitpy/layout_tests/port/factory_unittest.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 13 matching lines @@
 # 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 unittest2 as unittest
 
 from webkitpy.tool.mocktool import MockOptions
 from webkitpy.common.system.systemhost_mock import MockSystemHost
 
-from webkitpy.layout_tests.port import chromium_android
+from webkitpy.layout_tests.port import android
 from webkitpy.layout_tests.port import linux
 from webkitpy.layout_tests.port import mac
 from webkitpy.layout_tests.port import win
 from webkitpy.layout_tests.port import factory
 from webkitpy.layout_tests.port import test
 
 
 class FactoryTest(unittest.TestCase):
     """Test that the factory creates the proper port object for given combination of port_name, host.platform, and options."""
     # FIXME: The ports themselves should expose what options they require,
@@ skipping 11 matching lines @@
         self.assert_port(port_name='mac', os_name='mac', os_version='snowleopard',
                          cls=mac.MacPort)
         self.assert_port(port_name='chromium', os_name='mac', os_version='lion',
                          cls=mac.MacPort)
 
     def test_linux(self):
         self.assert_port(port_name='linux', cls=linux.LinuxPort)
         self.assert_port(port_name='chromium', os_name='linux', os_version='lucid',
                          cls=linux.LinuxPort)
 
-    def test_chromium_android(self):
-        self.assert_port(port_name='chromium-android', cls=chromium_android.ChromiumAndroidPort)
+    def test_android(self):
+        self.assert_port(port_name='android', cls=android.AndroidPort)
         # NOTE: We can't check for port_name=chromium here, as this will append the host's
         # operating system, whereas host!=target for Android.
 
     def test_win(self):
         self.assert_port(port_name='win-xp', cls=win.WinPort)
         self.assert_port(port_name='win', os_name='win', os_version='xp',
                          cls=win.WinPort)
         self.assert_port(port_name='chromium', os_name='win', os_version='xp',
                          cls=win.WinPort)
 
     def test_unknown_specified(self):
         self.assertRaises(NotImplementedError, factory.PortFactory(MockSystemHost()).get, port_name='unknown')
 
     def test_unknown_default(self):
         self.assertRaises(NotImplementedError, factory.PortFactory(MockSystemHost(os_name='vms')).get)
 
     def test_get_from_builder_name(self):
         self.assertEqual(factory.PortFactory(MockSystemHost()).get_from_builder_name('WebKit Mac10.7').name(),
                           'mac-lion')