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

BUG=348137
NOTRY=true

Review URL: https://codereview.chromium.org/186843002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255258 0039d316-1c4b-4281-b951-d872f2087c98

chrome/android/testshell/chrome_main_delegate_testshell_android.cc → chrome/android/shell/chrome_main_delegate_testshell_android.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "chrome/android/testshell/chrome_main_delegate_testshell_android.h"
+#include "chrome/android/shell/chrome_main_delegate_testshell_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"

chrome/android/testshell/chrome_main_delegate_testshell_android.h → chrome/android/shell/chrome_main_delegate_testshell_android.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#ifndef CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
-#define CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
+#ifndef CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
+#define CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
 
 #include "chrome/app/android/chrome_main_delegate_android.h"
 
@@ -18,4 +18,4 @@ class ChromeMainDelegateTestShellAndroid : public ChromeMainDelegateAndroid {
   DISALLOW_COPY_AND_ASSIGN(ChromeMainDelegateTestShellAndroid);
 };
 
-#endif  // CHROME_ANDROID_TESTSHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_
+#endif  // CHROME_ANDROID_SHELL_CHROME_MAIN_DELEGATE_TESTSHELL_ANDROID_H_

chrome/android/testshell/java/AndroidManifest.xml → chrome/android/shell/java/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 
-<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
+<!-- Copyright 2014 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.

chrome/android/testshell/testshell_google_location_settings_helper.cc → chrome/android/shell/testshell_google_location_settings_helper.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#include "chrome/android/testshell/testshell_google_location_settings_helper.h"
+#include "chrome/android/shell/testshell_google_location_settings_helper.h"
 
 // Factory function
 GoogleLocationSettingsHelper* GoogleLocationSettingsHelper::Create() {

chrome/android/testshell/testshell_google_location_settings_helper.h → chrome/android/shell/testshell_google_location_settings_helper.h

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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.
 
-#ifndef CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
-#define CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#ifndef CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#define CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
 
 #include "chrome/browser/android/google_location_settings_helper.h"
 
@@ -28,4 +28,4 @@ class TestShellGoogleLocationSettingsHelper
   DISALLOW_COPY_AND_ASSIGN(TestShellGoogleLocationSettingsHelper);
 };
 
-#endif  // CHROME_ANDROID_TESTSHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_
+#endif  // CHROME_ANDROID_SHELL_TESTSHELL_GOOGLE_LOCATION_SETTINGS_HELPER_H_

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',

chrome/chrome_tests.gypi

@@ -2981,7 +2981,7 @@
           ],
           'variables': {
             'apk_name': 'ChromiumTestShellTest',
-            'java_in_dir': 'android/testshell/javatests',
+            'java_in_dir': 'android/shell/javatests',
             'resource_dir': 'android/shell/res',
             'additional_src_dirs': ['android/javatests/src'],
             'is_test_apk': 1,