Migrate chime dfm definition downstream (Relandx2)

chime is a downstream only DFMs, it should be defined downstream only
and not reference clank from the chromium repo.

This reverts commit ba4e63fc.

Reason for reland: all chime references downstream are either removed or
guarded behind use_chime_android_sdk which will be set to false in this
cl.

Bug: 1142775,1143787
Change-Id: I0f988af70dbbf120d1954b47ca697b0ebf36cde6
Cq-Do-Not-Cancel-Tryjobs: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2514359
Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823355}

chrome/android/BUILD.gn

@@ -655,10 +655,6 @@ java_group("chrome_all_java") {
   if (dfmify_dev_ui) {
     deps += [ "//chrome/android/modules/dev_ui/provider:java" ]
   }
-
-  if (use_chime_android_sdk) {
-    deps += [ "//chrome/android/modules/chime/public:java" ]
-  }
 }
 
 # This is a list of all base module jni headers. New features should add their

chrome/android/modules/chime/DEPS

-include_rules = [
-  "+components/module_installer",
-]

chrome/android/modules/chime/OWNERS

-dtrainor@chromium.org
-hesen@chromium.org
-xingliu@chromium.org

chrome/android/modules/chime/chime_module.gni

@@ -2,22 +2,8 @@
 # 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")
-
 declare_args() {
-  # Whether to integrate Chime notification SDK into Chrome.
-  use_chime_android_sdk = true
-}
-
-chime_module_desc = {
-  name = "chime"
-  android_manifest =
-      "//chrome/android/modules/chime/internal/java/AndroidManifest.xml"
-
-  # The actual SDK lives in a DFM in downstream.
-  if (enable_chrome_android_internal) {
-    java_deps = [ "//clank/features/chime:chime_dfm_java" ]
-  } else {
-    java_deps = [ "//chrome/android/modules/chime/internal:java" ]
-  }
+  # temporarily disable chime sdk while migration downstream is in progress.
+  # crbug.com/1142775
+  use_chime_android_sdk = false
 }

chrome/android/modules/chime/internal/BUILD.gn

-# Copyright 2019 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/rules.gni")
-
-# Upstream chime DFM implementation which does nothing, the actual
-# implementation lives in downstream repo.
-android_library("java") {
-  sources =
-      [ "java/src/org/chromium/chrome/modules/chime/ChimeModuleEntryImpl.java" ]
-
-  deps = [
-    "//base:base_java",
-    "//chrome/android/modules/chime/public:java",
-  ]
-}

chrome/android/modules/chime/internal/java/AndroidManifest.xml

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2019 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. -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:dist="http://schemas.android.com/apk/distribution"
-    featureSplit="chime">
-    <dist:module
-        dist:onDemand="true"
-        dist:title="@string/chime_module_title">
-        <dist:fusing dist:include="true" />
-    </dist:module>
-</manifest>
\ No newline at end of file

chrome/android/modules/chime/internal/java/src/org/chromium/chrome/modules/chime/ChimeModuleEntryImpl.java

-// Copyright 2019 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.
-
-package org.chromium.chrome.modules.chime;
-
-import org.chromium.base.annotations.UsedByReflection;
-
-/**
- * Implementation of Chime DFM module hook. This is the upstream one that does nothing, the actual
- * implementation lives in downstream.
- */
-@UsedByReflection("ChimeModule")
-public class ChimeModuleEntryImpl extends ChimeModuleBase {}

chrome/android/modules/chime/public/BUILD.gn

@@ -4,18 +4,6 @@
 
 import("//build/config/android/rules.gni")
 
-android_library("java") {
-  sources = [
-    "java/src/org/chromium/chrome/modules/chime/ChimeModuleBase.java",
-    "java/src/org/chromium/chrome/modules/chime/ChimeModuleEntry.java",
-  ]
-
-  deps = [
-    "//base:base_java",
-    "//components/module_installer/android:module_installer_java",
-    "//components/module_installer/android:module_interface_java",
-  ]
-
-  annotation_processor_deps =
-      [ "//components/module_installer/android:module_interface_processor" ]
+# Empty target to prevent downstream breaking.
+java_group("java") {
 }

chrome/android/modules/chime/public/java/src/org/chromium/chrome/modules/chime/ChimeModuleBase.java

-// Copyright 2020 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.
-
-package org.chromium.chrome.modules.chime;
-
-/**
- * An empty base class for {@link ChimeModuleEntry}. The main purpose of this class is to make both
- * chromium upstream and clank downstream compile at the same time for the DFM module interface
- * {@link ChimeModuleEntry}.
- */
-public class ChimeModuleBase implements ChimeModuleEntry {
-    @Override
-    public void register() {}
-}

chrome/android/modules/chime/public/java/src/org/chromium/chrome/modules/chime/ChimeModuleEntry.java

-// Copyright 2019 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.
-
-package org.chromium.chrome.modules.chime;
-
-import org.chromium.components.module_installer.builder.ModuleInterface;
-
-/**
- * Use this module to register to Chime notification platform.
- */
-@ModuleInterface(module = "chime", impl = "org.chromium.chrome.modules.chime.ChimeModuleEntryImpl")
-public interface ChimeModuleEntry {
-    /**
-     * Registers the Chime notification SDK to the server.
-     */
-    void register();
-}

chrome/android/modules/chrome_feature_modules.gni

@@ -10,7 +10,6 @@ import("//chrome/android/features/tab_ui/tab_ui_module.gni")
 import("//chrome/android/modules/buildflags.gni")
 import(
     "//chrome/android/modules/cablev2_authenticator/cablev2_authenticator_module.gni")
-import("//chrome/android/modules/chime/chime_module.gni")
 import("//chrome/android/modules/extra_icu/extra_icu_module.gni")
 import("//chrome/android/modules/stack_unwinder/stack_unwinder_module.gni")
 import("//chrome/android/modules/test_dummy/test_dummy_module.gni")
@@ -57,9 +56,6 @@ if (enable_vr) {
 if (dfmify_dev_ui) {
   chrome_modern_module_descs += [ dev_ui_module_desc ]
 }
-if (use_chime_android_sdk) {
-  chrome_modern_module_descs += [ chime_module_desc ]
-}
 
 # Modules shipped in Monochrome (Android N+).
 monochrome_module_descs = chrome_modern_module_descs