[DevUI DFM] Move Java files to be in line with DFM convention.

Previously DevUI DFM Java files have locations that are inconsistent
with convention:
* Java files under .../modules/dev_ui/ should be in package
  org.chromium.chrome.features.dev_ui, but were instead placed in
  org.chromium.chrome.modules.dev_ui.
* /chrome/android/features/dev_ui/java should be
  /chrome/android/features/dev_ui/internal/java.

This CL fixes the above.

Change-Id: I523d040b0e1a2a041c2faa589d7606a04491ab1b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2018248Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Fred Mello <fredmello@chromium.org>
Commit-Queue: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735096}

chrome/android/features/dev_ui/BUILD.gn

@@ -18,5 +18,6 @@ android_library("java") {
     "//base:base_java",
     "//chrome/android/features/dev_ui/public:java",
   ]
-  sources = [ "java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java" ]
+  sources =
+      [ "internal/java/src/org/chromium/chrome/features/dev_ui/DevUiImpl.java" ]
 }

chrome/android/features/dev_ui/dev_ui_module.gni

@@ -11,7 +11,8 @@ declare_args() {
 dev_ui_module_desc = {
   name = "dev_ui"
   java_deps = [ "//chrome/android/features/dev_ui:java" ]
-  android_manifest = "//chrome/android/features/dev_ui/java/AndroidManifest.xml"
+  android_manifest =
+      "//chrome/android/features/dev_ui/internal/java/AndroidManifest.xml"
   paks = [ "$root_gen_dir/chrome/dev_ui_resources.pak" ]
   pak_deps = [ "//chrome/browser/resources:dev_ui_paks" ]
 }

chrome/android/modules/dev_ui/provider/BUILD.gn

@@ -13,15 +13,15 @@ android_library("java") {
   ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
   sources = [
-    "java/src/org/chromium/chrome/features/dev_ui/DevUiInstallListener.java",
-    "java/src/org/chromium/chrome/features/dev_ui/DevUiModuleProvider.java",
+    "java/src/org/chromium/chrome/modules/dev_ui/DevUiInstallListener.java",
+    "java/src/org/chromium/chrome/modules/dev_ui/DevUiModuleProvider.java",
   ]
 }
 
 generate_jni("jni_headers") {
   sources = [
-    "java/src/org/chromium/chrome/features/dev_ui/DevUiInstallListener.java",
-    "java/src/org/chromium/chrome/features/dev_ui/DevUiModuleProvider.java",
+    "java/src/org/chromium/chrome/modules/dev_ui/DevUiInstallListener.java",
+    "java/src/org/chromium/chrome/modules/dev_ui/DevUiModuleProvider.java",
   ]
 }
 

chrome/android/modules/dev_ui/provider/java/src/org/chromium/chrome/features/dev_ui/DevUiInstallListener.java → chrome/android/modules/dev_ui/provider/java/src/org/chromium/chrome/modules/dev_ui/DevUiInstallListener.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.features.dev_ui;
+package org.chromium.chrome.modules.dev_ui;
 
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;

chrome/android/modules/dev_ui/provider/java/src/org/chromium/chrome/features/dev_ui/DevUiModuleProvider.java → chrome/android/modules/dev_ui/provider/java/src/org/chromium/chrome/modules/dev_ui/DevUiModuleProvider.java

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.features.dev_ui;
+package org.chromium.chrome.modules.dev_ui;
 
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.chrome.features.dev_ui.DevUiModule;
 
 /** Helpers for DevUI DFM installation. */
 public class DevUiModuleProvider {