Change webapk packages and directory structure

webapk/shell_apk/javatests/dex_optimizer/BUILD.gn

Index: webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
diff --git a/web_apks/minting_example/javatests/dex_optimizer/BUILD.gn b/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
similarity index 56%
rename from web_apks/minting_example/javatests/dex_optimizer/BUILD.gn
rename to webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
index 087683cf87887abf3ea9f916cb398a8c0735d14d..baa5052056b261e4b84f73bb1db3173862bbab94 100644
--- a/web_apks/minting_example/javatests/dex_optimizer/BUILD.gn
+++ b/webapk/shell_apk/javatests/dex_optimizer/BUILD.gn
@@ -5,9 +5,10 @@
 import("//build/config/android/rules.gni")
 
 android_aidl("dex_optimizer_service_aidl") {
-  interface_file = "src/org/chromium/minting/test/dex_optimizer/common.aidl"
+  interface_file =
+      "src/org/chromium/webapk/shell_apk/test/dex_optimizer/common.aidl"
   sources = [
-    "src/org/chromium/minting/test/dex_optimizer/IDexOptimizerService.aidl",
+    "src/org/chromium/webapk/shell_apk/test/dex_optimizer/IDexOptimizerService.aidl",
   ]
 }
 
@@ -15,11 +16,11 @@ android_apk("dex_optimizer_apk") {
   android_manifest = "AndroidManifest.xml"
   apk_name = "DexOptimizer"
   chromium_code = false
-  java_files = [ "src/org/chromium/minting/test/dex_optimizer/DexOptimizerServiceImpl.java" ]
+  java_files = [ "src/org/chromium/webapk/shell_apk/test/dex_optimizer/DexOptimizerServiceImpl.java" ]
   deps = [
     "//base:base_java",
-    "//web_apks/minting_example:minting_client_lib",
-    "//web_apks/minting_example/javatests/canary_lib:canary_dex_asset",
+    "//webapk/libs/client",
+    "//webapk/shell_apk/javatests/canary_lib:canary_dex_asset",
   ]
   srcjar_deps = [ ":dex_optimizer_service_aidl" ]
 }