Migrate dynamic module interface to DEPS.

Remove the dynamic module interface defined in the Chromium repository in favor of the copy pulled in via DEPS and updates the build files correspondingly.

Bug: 873098
Change-Id: Ic8b38906eceb7f9bf46ed9c95e5d7e3dd82b8e5e
Reviewed-on: https://chromium-review.googlesource.com/1172427
Commit-Queue: Anna Malova <amalova@chromium.org>
Reviewed-by: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Chris Palmer <palmer@chromium.org>
Reviewed-by: Bernhard Bauer <bauerb@chromium.org>
Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589509}

DEPS

@@ -574,6 +574,11 @@ deps = {
   'src/third_party/catapult':
     Var('chromium_git') + '/catapult.git' + '@' + Var('catapult_revision'),
 
+  'src/third_party/cct_dynamic_module/src': {
+      'url': Var('chromium_git') + '/dynamicmodule' + '@' + 'c6d37ea1003931dd44b78f936ca0882956aa3107',
+      'condition': 'checkout_android',
+  },
+
   'src/third_party/ced/src':
     Var('chromium_git') + '/external/github.com/google/compact_enc_det.git' + '@' + '94c367a1fe3a13207f4b22604fcfd1d9f9ddf6d9',
 
@@ -612,11 +617,6 @@ deps = {
   'src/third_party/dom_distiller_js/dist':
     Var('chromium_git') + '/chromium/dom-distiller/dist.git' + '@' + '3093c3e238768ab27ff756bd7563ccbb12129d9f',
 
-  'src/third_party/dynamicmodule': {
-      'url': Var('chromium_git') + '/dynamicmodule' + '@' + 'c6d37ea1003931dd44b78f936ca0882956aa3107',
-      'condition': 'checkout_android',
-  },
-
   'src/third_party/elfutils/src': {
       'url': Var('chromium_git') + '/external/elfutils.git' + '@' + '249673729a7e5dbd5de4f3760bdcaa3d23d154d7',
       'condition': 'checkout_android_native_support',

chrome/android/BUILD.gn

@@ -199,17 +199,6 @@ android_aidl("photo_picker_aidl") {
   ]
 }
 
-android_aidl("cct_dynamic_module_aidl") {
-  import_include = [ "java/src" ]
-  sources = [
-    "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IActivityDelegate.aidl",
-    "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IActivityHost.aidl",
-    "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IModuleEntryPoint.aidl",
-    "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IModuleHost.aidl",
-    "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IObjectWrapper.aidl",
-  ]
-}
-
 android_library("chrome_java") {
   deps = [
     ":chrome_app_java_resources",
@@ -303,6 +292,7 @@ android_library("chrome_java") {
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
     "//third_party/cacheinvalidation:cacheinvalidation_proto_java",
     "//third_party/custom_tabs_client:custom_tabs_support_java",
+    "//third_party/cct_dynamic_module:cct_dynamic_module_java",
     "//third_party/gif_player:gif_player_java",
     "//third_party/jsr-305:jsr_305_javalib",
     "//third_party/leakcanary:leakcanary_java",
@@ -319,7 +309,6 @@ android_library("chrome_java") {
     ":chrome_android_java_enums_srcjar",
     ":chrome_android_java_google_api_keys_srcjar",
     ":chrome_version_srcjar",
-    ":cct_dynamic_module_aidl",
     ":photo_picker_aidl",
     ":resource_id_javagen",
     "//chrome:assist_ranker_prediction_enum_javagen",

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IActivityDelegate.aidl

-// Copyright 2018 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.browser.customtabs.dynamicmodule;
-
-import org.chromium.chrome.browser.customtabs.dynamicmodule.IObjectWrapper;
-
-interface IActivityDelegate {
-  void onCreate(in Bundle savedInstanceState) = 0;
-
-  void onPostCreate(in Bundle savedInstanceState) = 1;
-
-  void onStart() = 2;
-
-  void onStop() = 3;
-
-  void onWindowFocusChanged(boolean hasFocus) = 4;
-
-  void onSaveInstanceState(in Bundle outState) = 5;
-
-  void onRestoreInstanceState(in Bundle savedInstanceState) = 6;
-
-  void onResume() = 7;
-
-  void onPause() = 8;
-
-  void onDestroy() = 9;
-
-  boolean onBackPressed() = 10;
-
-  /**
-   * Offers an opportunity to handle the back press event. If it is not handled,
-   * the Runnable must be run.
-   *
-   * Introduced in API version 2.
-   */
-  void onBackPressedAsync(in IObjectWrapper /* Runnable */ notHandledRunnable) = 11;
-}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IActivityHost.aidl

-// Copyright 2018 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.browser.customtabs.dynamicmodule;
-
-import android.net.Uri;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.IObjectWrapper;
-
-interface IActivityHost {
-  IObjectWrapper /* Context */ getActivityContext() = 0;
-
-  void setBottomBarView(in IObjectWrapper /* View */ bottomBarView) = 1;
-
-  void setOverlayView(in IObjectWrapper /* View */ overlayView) = 2;
-
-  void setBottomBarHeight(int height) = 3;
-
-  /**
-   * Loads a URI in the existing CCT activity. This is used by features that
-   * want to show web content (e.g. saves when reopening a saved page).
-   *
-   * Introduced in API version 3.
-   */
-  void loadUri(in Uri uri) = 4;
-}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IModuleEntryPoint.aidl

-// Copyright 2018 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.browser.customtabs.dynamicmodule;
-
-import org.chromium.chrome.browser.customtabs.dynamicmodule.IActivityDelegate;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.IActivityHost;
-import org.chromium.chrome.browser.customtabs.dynamicmodule.IModuleHost;
-
-interface IModuleEntryPoint {
-  void init(in IModuleHost moduleHost) = 0;
-  int getModuleVersion() = 1;
-  int getMinimumHostVersion() = 2;
-  IActivityDelegate createActivityDelegate(in IActivityHost activityHost) = 3;
-  void onDestroy() = 4;
-}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IModuleHost.aidl

-// Copyright 2018 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.browser.customtabs.dynamicmodule;
-
-import org.chromium.chrome.browser.customtabs.dynamicmodule.IObjectWrapper;
-
-interface IModuleHost {
-  IObjectWrapper /* Context */ getHostApplicationContext() = 0;
-  IObjectWrapper /* Context */ getModuleContext() = 1;
-  int getHostVersion() = 2;
-  int getMinimumModuleVersion() = 3;
-}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/IObjectWrapper.aidl

-// Copyright 2018 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.browser.customtabs.dynamicmodule;
-
-/**
- * This interface intentionally has no methods, and instances of this should
- * be created from class ObjectWrapper only. This is used as a way of passing
- * objects that descend from the system classes via AIDL across classloaders
- * without serializing them.
- */
-interface IObjectWrapper {
-}
\ No newline at end of file

third_party/.gitignore

@@ -41,6 +41,7 @@
 /cacheinvalidation/cacheinvalidation_unittests_run.xml
 /cardboard-java/src
 /catapult
+/cct_dynamic_module/src
 /ced/src
 /checkstyle/*.jar
 /chromeos_login_manager
@@ -58,7 +59,6 @@
 /devtools-node-modules
 /directxsdk
 /dom_distiller_js/dist
-/dynamicmodule
 /elfutils/src
 /errorprone/lib
 /espresso/lib/

third_party/cct_dynamic_module/BUILD.gn

+# Copyright 2018 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")
+
+android_library("cct_dynamic_module_java") {
+  java_files = [
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/BaseActivityDelegate.java",
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/BaseActivityHost.java",
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/BaseModuleEntryPoint.java",
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/BaseModuleHost.java",
+  ]
+
+  srcjar_deps = [ ":cct_dynamic_module_aidl" ]
+}
+
+android_aidl("cct_dynamic_module_aidl") {
+  interface_file = "common.aidl"
+  sources = [
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/IActivityDelegate.aidl",
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/IActivityHost.aidl",
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/IModuleEntryPoint.aidl",
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/IModuleHost.aidl",
+    "src/src/java/org/chromium/chrome/browser/customtabs/dynamicmodule/IObjectWrapper.aidl",
+  ]
+}
+

third_party/cct_dynamic_module/OWNERS

+mvanouwerkerk@chromium.org
+amalova@chromium.org
+per-file *.aidl=set noparent
+per-file *.aidl=file://ipc/SECURITY_OWNERS

third_party/cct_dynamic_module/README.chromium

+Name: CCT dynamic module
+Short name: cct_dynamic_module
+URL: https://chromium.googlesource.com/dynamicmodule
+Version: 0
+Revision: c6d37ea1003931dd44b78f936ca0882956aa3107
+License: BSD
+License File: src/LICENSE
+Security Critical: yes
+Description: API definition of CCT dynamic module
+Local Modification: None
+

third_party/cct_dynamic_module/common.aidl

+// Copyright 2018 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.
+
+interface org.chromium.chrome.browser.customtabs.dynamicmodule.IActivityDelegate;
+interface org.chromium.chrome.browser.customtabs.dynamicmodule.IActivityHost;
+interface org.chromium.chrome.browser.customtabs.dynamicmodule.IModuleEntryPoint;
+interface org.chromium.chrome.browser.customtabs.dynamicmodule.IModuleHost;
+interface org.chromium.chrome.browser.customtabs.dynamicmodule.IObjectWrapper;