Change webapk packages and directory structure

content/shell/android/BUILD.gn

 # 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.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//third_party/icu/config.gni")
 
 generate_jni("content_shell_jni_headers") {
@@ skipping 136 matching lines @@
     "javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java",
     "javatests/src/org/chromium/content_shell_apk/ContentShellUrlTest.java",
   ]
 }
 
 instrumentation_test_apk("content_shell_test_apk") {
   deps = [
     "//base:base_javatests",
     "//content/public/android:content_javatests",
     "//net/android:net_javatests",
-    "//web_apks/minting_example:web_apk_javatests",
+    "//webapk/shell_apk:shell_apk_javatests",
   ]
   data_deps = [
     ":content_shell_apk",
   ]
   additional_apks = [
-    "//web_apks/minting_example:minting_example_apk",
-    "//web_apks/minting_example/javatests/dex_optimizer:dex_optimizer_apk",
+    "//webapk/shell_apk:shell_apk",
+    "//webapk/shell_apk/javatests/dex_optimizer:dex_optimizer_apk",
   ]
   apk_under_test = ":content_shell_apk"
   apk_name = "ContentShellTest"
   android_manifest = "javatests/AndroidManifest.xml"
   isolate_file = "../../content_shell_test_data.isolate"
 }
 
 if (current_cpu != "x64") {
   chromium_linker_test_manifest =
       "$target_gen_dir/linker_test_apk/AndroidManifest.xml"
@@ skipping 73 matching lines @@
   testonly = true
   deps = [
     ":content_shell_java",
     "//base:base_java",
     "//content/public/android:content_java",
     "//testing/android/native_test:native_test_java",
     "//ui/android:ui_java",
   ]
   java_files = [ "browsertests/src/org/chromium/content_shell/browsertests/ContentShellBrowserTestActivity.java" ]
 }