Move ChromeShell files from chrome/android/testshell to chrome/android/shell.

chrome/chrome_android.gypi

Index: chrome/chrome_android.gypi
diff --git a/chrome/chrome_android.gypi b/chrome/chrome_android.gypi
index 8292d4b68f20974490d3b0220ee1c3667988ef43..b7b9f1761ea707ba37b6489d418597d2948daeac 100644
--- a/chrome/chrome_android.gypi
+++ b/chrome/chrome_android.gypi
@@ -23,10 +23,10 @@
         # This file must always be included in the shared_library step to ensure
         # JNI_OnLoad is exported.
         'app/android/chrome_jni_onload.cc',
-        'android/testshell/chrome_main_delegate_testshell_android.cc',
-        'android/testshell/chrome_main_delegate_testshell_android.h',
-        "android/testshell/testshell_google_location_settings_helper.cc",
-        "android/testshell/testshell_google_location_settings_helper.h",
+        'android/shell/chrome_main_delegate_testshell_android.cc',
+        'android/shell/chrome_main_delegate_testshell_android.h',
+        "android/shell/testshell_google_location_settings_helper.cc",
+        "android/shell/testshell_google_location_settings_helper.h",
       ],
       'include_dirs': [
         '../skia/config',
@@ -57,7 +57,7 @@
       'variables': {
         'apk_name': 'ChromiumTestShell',
         'manifest_package_name': 'org.chromium.chrome.shell',
-        'java_in_dir': 'android/testshell/java',
+        'java_in_dir': 'android/shell/java',
         'resource_dir': 'android/shell/res',
         'asset_location': '<(PRODUCT_DIR)/../assets/<(package_name)',
         'native_lib_target': 'libchromiumtestshell',