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

chrome/chrome_android.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chromium_code': 1,
     'package_name': 'chromium_testshell',
   },
   'includes': [
     'chrome_android_paks.gypi', # Included for the list of pak resources.
   ],
   'targets': [
     {
       'target_name': 'libchromiumtestshell',
       'type': 'shared_library',
       'dependencies': [
         '../base/base.gyp:base',
         'chrome_android_core',
         'chrome.gyp:browser_ui',
         '../content/content.gyp:content_app_browser',
       ],
       'sources': [
         # 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',
       ],
       'conditions': [
         [ 'order_profiling!=0', {
           'conditions': [
             [ 'OS=="android"', {
               'dependencies': [ '../tools/cygprofile/cygprofile.gyp:cygprofile', ],
             }],
@@ skipping 10 matching lines @@
       'type': 'none',
       'dependencies': [
         '../media/media.gyp:media_java',
         'chrome.gyp:chrome_java',
         'chromium_testshell_paks',
         'libchromiumtestshell',
       ],
       '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',
         'native_lib_version_name': '<(version_full)',
         'additional_input_paths': [
           '<@(chrome_android_pak_output_resources)',
         ],
       },
       'includes': [ '../build/java_apk.gypi', ],
     },
@@ skipping 51 matching lines @@
         {
           'destination': '<(chrome_android_pak_output_folder)',
           'files': [
             '<@(chrome_android_pak_input_resources)',
           ],
         }
       ],
     },
   ],
 }