Android: consolidate support components for embedders

Moves web_contents_delegate_android under embedder_support to
consolidate all the support components for embedders. The package path
is org.chromium.embedder_support.delegate. Now the component
has 4 main targets for embedders:
 - media
 - view
 - content_view
 - web_contents_delegate

Note:

- The choice of 'delegate' in the package name of WebContentsDelegateAndroid
  is just to avoid having WCDA repeated in the path. (import org.chromium
  .embedder_support.web_contents_delegate_android.WebContentsDelegateAndroid
   looked odd to me).
- Got rid of 'android' wherever it is repeated in the path, and the deletion
  won't cause confusion.
  e.g. web_contents_delegate_android_java -> web_contents_delegate_java
- Needs changes in the internal repo as well
  https://chrome-internal-review.googlesource.com/c/clank/internal/apps/+/646448


Change-Id: I44c25435c32330439ffa765d80df45b02d0694b1
Reviewed-on: https://chromium-review.googlesource.com/1118926
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Cait Phillips <caitkp@chromium.org>
Reviewed-by: agrieve <agrieve@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574401}

android_webview/BUILD.gn

@@ -713,6 +713,7 @@ source_set("common") {
     "//components/crash/content/app",
     "//components/crash/content/browser",
     "//components/download/public/common:public",
+    "//components/embedder_support/android:web_contents_delegate",
     "//components/google/core/browser",
     "//components/heap_profiling",
     "//components/keyed_service/content",
@@ -750,7 +751,6 @@ source_set("common") {
     "//components/visitedlink/browser",
     "//components/visitedlink/renderer",
     "//components/viz/service",
-    "//components/web_contents_delegate_android:web_contents_delegate_android",
     "//components/web_restrictions:browser",
     "//content",
     "//content/public/app:both",
@@ -894,6 +894,7 @@ android_library("android_webview_java") {
     "//components/autofill/android:provider_java",
     "//components/background_task_scheduler:background_task_scheduler_java",
     "//components/crash/android:java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/navigation_interception/android:navigation_interception_java",
     "//components/policy/android:policy_java",
@@ -901,7 +902,6 @@ android_library("android_webview_java") {
     "//components/variations:load_seed_result_enum_java",
     "//components/variations/android:variations_java",
     "//components/version_info/android:version_constants_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:client_java",
     "//content/public/android:content_java",
     "//device/gamepad:java",

android_webview/browser/DEPS

@@ -46,7 +46,7 @@ include_rules = [
   "+media/base/android",
 
   "+components/policy/policy_constants.h",
-  "+components/web_contents_delegate_android",
+  "+components/embedder_support/android",
 
   "+printing",
 

android_webview/browser/aw_web_contents_delegate.h

@@ -5,7 +5,7 @@
 #ifndef ANDROID_WEBVIEW_BROWSER_AW_WEB_CONTENTS_DELEGATE_H_
 #define ANDROID_WEBVIEW_BROWSER_AW_WEB_CONTENTS_DELEGATE_H_
 
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 
 namespace android_webview {
 

android_webview/java/DEPS

@@ -1,11 +1,11 @@
 include_rules = [
   "+components/autofill/android/java",
   "+components/background_task_scheduler/android/java",
+  "+components/embedder_support/android/java",
   "+components/minidump_uploader/android/java",
   "+components/navigation_interception/android/java",
   "+components/policy/android/java",
   "+components/safe_browsing/android/java",
-  "+components/web_contents_delegate_android/java",
   "+components/variations/android/java",
 
   "-content/public/android/java",

android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegate.java

@@ -7,7 +7,7 @@ package org.chromium.android_webview;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 
 /**
  * WebView-specific WebContentsDelegate.

android_webview/test/BUILD.gn

@@ -131,12 +131,12 @@ instrumentation_test_apk("webview_instrumentation_test_apk") {
     "//base:base_java",
     "//base:base_java_test_support",
     "//components/autofill/android:provider_java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/minidump_uploader:minidump_uploader_java",
     "//components/minidump_uploader:minidump_uploader_javatests",
     "//components/policy/android:policy_java",
     "//components/policy/android:policy_java_test_support",
     "//components/safe_browsing/android:safe_browsing_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//mojo/public/java:bindings_java",

build/android/lint/suppressions.xml

@@ -157,7 +157,7 @@ Still reading?
     <ignore regexp="tools/android/push_apps_to_background/res"/>
     <ignore regexp="ui/android/java/res"/>
     <!-- crbug.com/457918 is tracking missing assets -->
-    <ignore regexp="components/web_contents_delegate_android/java/res"/>
+    <ignore regexp="components/embedder_support/android/java/res"/>
   </issue>
   <issue id="ImpliedQuantity" severity="Error">
     <ignore regexp="chrome/android/chrome_strings_grd"/>

chrome/android/BUILD.gn

@@ -236,6 +236,7 @@ android_library("chrome_java") {
     "//components/download/public/common:public_java",
     "//components/embedder_support/android:content_view_java",
     "//components/embedder_support/android:media_java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/gcm_driver/android:gcm_driver_java",
     "//components/gcm_driver/instance_id/android:instance_id_driver_java",
@@ -255,7 +256,6 @@ android_library("chrome_java") {
     "//components/variations/android:variations_java",
     "//components/version_info/android:version_constants_java",
     "//components/viz/service:service_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:provider_java",
     "//content/public/android:content_java",
     "//device/gamepad:java",
@@ -580,6 +580,7 @@ android_library("chrome_test_java") {
     "//components/crash/android:javatests",
     "//components/dom_distiller/core/android:dom_distiller_core_java",
     "//components/download/internal/background_service:internal_java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/feature_engagement:feature_engagement_java",
     "//components/gcm_driver/android:gcm_driver_java",
     "//components/gcm_driver/instance_id/android:instance_id_driver_java",
@@ -603,7 +604,6 @@ android_library("chrome_test_java") {
     "//components/sync/android:sync_java",
     "//components/sync/android:sync_javatests",
     "//components/url_formatter/android:url_formatter_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:provider_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",

chrome/android/java/DEPS

@@ -6,6 +6,7 @@ include_rules = [
   "+components/crash/android/java",
   "+components/dom_distiller/content/browser/android/java/src/org/chromium/components/dom_distiller/content",
   "+components/dom_distiller/core/android/java/src/org/chromium/components/dom_distiller/core",
+  "+components/embedder_support/android/delegate",
   "+components/feature_engagement/public/android/java/src/org/chromium/components/feature_engagement",
   "+components/gcm_driver/android/java/src/org/chromium/components/gcm_driver",
   "+components/location/android/java",
@@ -14,7 +15,6 @@ include_rules = [
   "+components/offline_items_collection/core/android/java",
   "+components/payments/content/android/java/src/org/chromium/components/payments",
   "+components/sync/android/java/src/org/chromium/components/sync",
-  "+components/web_contents_delegate_android",
   "+components/web_restrictions",
 
   "-content/public/android",

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java

@@ -19,10 +19,10 @@ import org.chromium.chrome.browser.content.ContentUtils;
 import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler;
 import org.chromium.chrome.browser.tab.Tab;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.components.embedder_support.view.ContentView;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.components.navigation_interception.NavigationParams;
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
 import org.chromium.content_public.browser.ContentVideoViewEmbedder;
 import org.chromium.content_public.browser.ContentViewCore;
 import org.chromium.content_public.browser.LoadUrlParams;

chrome/android/java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.document;
 
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.content_public.browser.WebContents;
 
 /**
@@ -48,4 +48,4 @@ public class DocumentWebContentsDelegate extends WebContentsDelegateAndroid {
     private native long nativeInitialize();
     private native void nativeAttachContents(
             long nativeDocumentWebContentsDelegate, WebContents webContents);
-}
+}

chrome/android/java/src/org/chromium/chrome/browser/tab/TabDelegateFactory.java

@@ -6,8 +6,8 @@ package org.chromium.chrome.browser.tab;
 
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator;
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
 
 /**
  * A factory class to create {@link Tab} related delegates.

chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsDelegateAndroid.java

@@ -43,8 +43,8 @@ import org.chromium.chrome.browser.tabmodel.TabModel;
 import org.chromium.chrome.browser.tabmodel.TabModel.TabLaunchType;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.browser.tabmodel.TabWindowManager;
+import org.chromium.components.embedder_support.delegate.WebContentsDelegateAndroid;
 import org.chromium.components.embedder_support.media.ActivityContentVideoViewEmbedder;
-import org.chromium.components.web_contents_delegate_android.WebContentsDelegateAndroid;
 import org.chromium.content_public.browser.ContentVideoViewEmbedder;
 import org.chromium.content_public.browser.GestureListenerManager;
 import org.chromium.content_public.browser.InvalidateTypes;

chrome/browser/BUILD.gn

@@ -2434,12 +2434,12 @@ jumbo_split_static_library("browser") {
       "//chrome/services/media_gallery_util/public/cpp",
       "//components/cdm/browser",
       "//components/data_usage/android",
+      "//components/embedder_support/android:web_contents_delegate",
       "//components/feed:buildflags",
       "//components/feed:feature_list",
       "//components/payments/content/android",
       "//components/resources:components_resources",
       "//components/toolbar",
-      "//components/web_contents_delegate_android",
       "//rlz:rlz_utils",
       "//sandbox",
       "//sandbox:sandbox_buildflags",

chrome/browser/android/DEPS

@@ -2,13 +2,13 @@ include_rules = [
   "-components/devtools_bridge",
   "+cc/layers/layer.h",
   "+chrome_jni_registration/chrome_jni_registration.h",
+  "+components/embedder_suport",
   "+components/ntp_snippets",
   "+components/spellcheck/browser",
   "+components/sync/android",
   "+components/sync/test/fake_server/android",
   "+components/toolbar",
   "+components/viz/common/gpu/context_provider.h",
-  "+components/web_contents_delegate_android",
   "+device/vr/buildflags/buildflags.h",
   "+sandbox/linux/seccomp-bpf/sandbox_bpf.h",
   "+sandbox/linux/seccomp-bpf-helpers",

chrome/browser/android/bottombar/overlay_panel_content.cc

@@ -16,10 +16,10 @@
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "chrome/common/chrome_render_frame.mojom.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "components/variations/variations_associated_data.h"
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/browser_controls_state.h"

chrome/browser/android/document/document_web_contents_delegate.cc

@@ -4,7 +4,7 @@
 
 #include "chrome/browser/android/document/document_web_contents_delegate.h"
 
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/DocumentWebContentsDelegate_jni.h"
 

chrome/browser/android/document/document_web_contents_delegate.h

@@ -7,7 +7,7 @@
 
 #include <stdint.h>
 
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 
 // Stub WebContentsDelegateAndroid that is meant to be a temporary substitute
 // for a real WebContentsDelegate for the (expectedly short) period between when

chrome/browser/android/tab_web_contents_delegate_android.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_ANDROID_TAB_WEB_CONTENTS_DELEGATE_ANDROID_H_
 
 #include "base/files/file_path.h"
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 #include "content/public/browser/bluetooth_chooser.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"

chrome/browser/ui/BUILD.gn

@@ -1237,9 +1237,9 @@ split_static_library("ui") {
     ]
     deps += [
       "//chrome/browser:jni_headers",
+      "//components/embedder_support/android:web_contents_delegate",
       "//components/navigation_interception",
       "//components/subresource_filter/core/browser:browser",
-      "//components/web_contents_delegate_android",
       "//crypto:platform",
       "//device/usb/mojo",
       "//device/usb/public/cpp",

chrome/browser/ui/android/color_chooser_dialog_android.cc

@@ -5,7 +5,7 @@
 #include "chrome/browser/ui/browser_dialogs.h"
 
 // The actual android color chooser is at
-// components/web_contents_delegate_android/color_chooser_android.cc
+// components/embedder_support/android/delegate/color_chooser_android.cc
 
 namespace chrome {
 

chrome/test/android/BUILD.gn

@@ -74,6 +74,7 @@ android_library("chrome_java_test_support") {
     "//chrome/android:chrome_java",
     "//chrome/android/third_party/compositor_animator:compositor_animator_java",
     "//components/bookmarks/common/android:bookmarks_java",
+    "//components/embedder_support/android:web_contents_delegate_java",
     "//components/invalidation/impl:java",
     "//components/location/android:location_java",
     "//components/policy/android:policy_java",
@@ -81,7 +82,6 @@ android_library("chrome_java_test_support") {
     "//components/signin/core/browser/android:java",
     "//components/signin/core/browser/android:signin_java_test_support",
     "//components/sync/android:sync_java",
-    "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//content/public/android:content_java",
     "//content/public/test/android:content_java_test_support",
     "//net/android:net_java",

components/OWNERS

@@ -30,7 +30,7 @@ per-file sync_ui_strings.grdp=file://components/sync/OWNERS
 per-file translate_strings.grdp=file://components/translate/OWNERS
 per-file undo_strings.grdp=file://components/undo/OWNERS
 per-file version_ui_strings.grdp=file://components/version_ui/OWNERS
-per-file web_contents_delegate_android_strings.grdp=file://components/web_contents_delegate_android/OWNERS
+per-file web_contents_delegate_android_strings.grdp=file://components/embedder_support/android/delegate/OWNERS
 
 # These are for the common case of adding or removing tests. If you're making
 # structural changes, please get a review from one of the overall components

components/embedder_support/android/BUILD.gn

@@ -54,3 +54,112 @@ generate_jni("view_jni_headers") {
   ]
   jni_package = "view"
 }
+
+java_strings_grd("web_contents_delegate_strings_grd") {
+  grd_file = "java/strings/web_contents_delegate_android_strings.grd"
+  outputs = [
+    "values-am/web_contents_delegate_android_strings.xml",
+    "values-ar/web_contents_delegate_android_strings.xml",
+    "values-bg/web_contents_delegate_android_strings.xml",
+    "values-ca/web_contents_delegate_android_strings.xml",
+    "values-cs/web_contents_delegate_android_strings.xml",
+    "values-da/web_contents_delegate_android_strings.xml",
+    "values-de/web_contents_delegate_android_strings.xml",
+    "values-el/web_contents_delegate_android_strings.xml",
+    "values/web_contents_delegate_android_strings.xml",
+    "values-en-rGB/web_contents_delegate_android_strings.xml",
+    "values-es/web_contents_delegate_android_strings.xml",
+    "values-es-rUS/web_contents_delegate_android_strings.xml",
+    "values-fa/web_contents_delegate_android_strings.xml",
+    "values-fi/web_contents_delegate_android_strings.xml",
+    "values-tl/web_contents_delegate_android_strings.xml",
+    "values-fr/web_contents_delegate_android_strings.xml",
+    "values-hi/web_contents_delegate_android_strings.xml",
+    "values-hr/web_contents_delegate_android_strings.xml",
+    "values-hu/web_contents_delegate_android_strings.xml",
+    "values-in/web_contents_delegate_android_strings.xml",
+    "values-it/web_contents_delegate_android_strings.xml",
+    "values-iw/web_contents_delegate_android_strings.xml",
+    "values-ja/web_contents_delegate_android_strings.xml",
+    "values-ko/web_contents_delegate_android_strings.xml",
+    "values-lt/web_contents_delegate_android_strings.xml",
+    "values-lv/web_contents_delegate_android_strings.xml",
+    "values-nl/web_contents_delegate_android_strings.xml",
+    "values-nb/web_contents_delegate_android_strings.xml",
+    "values-pl/web_contents_delegate_android_strings.xml",
+    "values-pt-rBR/web_contents_delegate_android_strings.xml",
+    "values-pt-rPT/web_contents_delegate_android_strings.xml",
+    "values-ro/web_contents_delegate_android_strings.xml",
+    "values-ru/web_contents_delegate_android_strings.xml",
+    "values-sk/web_contents_delegate_android_strings.xml",
+    "values-sl/web_contents_delegate_android_strings.xml",
+    "values-sr/web_contents_delegate_android_strings.xml",
+    "values-sv/web_contents_delegate_android_strings.xml",
+    "values-sw/web_contents_delegate_android_strings.xml",
+    "values-th/web_contents_delegate_android_strings.xml",
+    "values-tr/web_contents_delegate_android_strings.xml",
+    "values-uk/web_contents_delegate_android_strings.xml",
+    "values-vi/web_contents_delegate_android_strings.xml",
+    "values-zh-rCN/web_contents_delegate_android_strings.xml",
+    "values-zh-rTW/web_contents_delegate_android_strings.xml",
+  ]
+}
+
+static_library("web_contents_delegate") {
+  sources = [
+    "delegate/color_chooser_android.cc",
+    "delegate/color_chooser_android.h",
+    "delegate/web_contents_delegate_android.cc",
+    "delegate/web_contents_delegate_android.h",
+  ]
+
+  deps = [
+    ":web_contents_delegate_jni_headers",
+    "//base",
+    "//content/public/browser",
+    "//content/public/common",
+    "//net",
+    "//skia",
+    "//ui/android",
+    "//ui/base",
+    "//ui/gfx",
+    "//ui/gfx/geometry",
+  ]
+}
+
+android_resources("web_contents_delegate_java_resources") {
+  custom_package = "org.chromium.components.embedder_support.delegate"
+  resource_dirs = [ "java/res" ]
+  deps = [
+    ":web_contents_delegate_strings_grd",
+  ]
+}
+
+android_library("web_contents_delegate_java") {
+  deps = [
+    ":web_contents_delegate_java_resources",
+    "//base:base_java",
+    "//content/public/android:content_java",
+    "//ui/android:ui_java",
+  ]
+  java_files = [
+    "java/src/org/chromium/components/embedder_support/delegate/ColorChooserAndroid.java",
+    "java/src/org/chromium/components/embedder_support/delegate/ColorPickerAdvanced.java",
+    "java/src/org/chromium/components/embedder_support/delegate/ColorPickerAdvancedComponent.java",
+    "java/src/org/chromium/components/embedder_support/delegate/ColorPickerDialog.java",
+    "java/src/org/chromium/components/embedder_support/delegate/ColorPickerMoreButton.java",
+    "java/src/org/chromium/components/embedder_support/delegate/ColorPickerSimple.java",
+    "java/src/org/chromium/components/embedder_support/delegate/ColorSuggestion.java",
+    "java/src/org/chromium/components/embedder_support/delegate/ColorSuggestionListAdapter.java",
+    "java/src/org/chromium/components/embedder_support/delegate/WebContentsDelegateAndroid.java",
+    "java/src/org/chromium/components/embedder_support/delegate/OnColorChangedListener.java",
+  ]
+}
+
+generate_jni("web_contents_delegate_jni_headers") {
+  sources = [
+    "java/src/org/chromium/components/embedder_support/delegate/ColorChooserAndroid.java",
+    "java/src/org/chromium/components/embedder_support/delegate/WebContentsDelegateAndroid.java",
+  ]
+  jni_package = "web_contents_delegate_android"
+}

components/embedder_support/android/delegate/OWNERS

@@ -0,0 +1,2 @@
+boliu@chromium.org
+tedchoc@chromium.org

components/embedder_support/android/delegate/color_chooser_android.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/web_contents_delegate_android/color_chooser_android.h"
+#include "components/embedder_support/android/delegate/color_chooser_android.h"
 
 #include <stddef.h>
 
@@ -50,8 +50,7 @@ ColorChooserAndroid::ColorChooserAndroid(
     OnColorChosen(env, j_color_chooser_, initial_color);
 }
 
-ColorChooserAndroid::~ColorChooserAndroid() {
-}
+ColorChooserAndroid::~ColorChooserAndroid() {}
 
 void ColorChooserAndroid::End() {
   if (!j_color_chooser_.is_null()) {

components/embedder_support/android/delegate/color_chooser_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
-#define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
+#ifndef COMPONENTS_EMBEDDER_SUPPORT_ANDROID_DELEGATE_COLOR_CHOOSER_ANDROID_H_
+#define COMPONENTS_EMBEDDER_SUPPORT_ANDROID_DELEGATE_COLOR_CHOOSER_ANDROID_H_
 
 #include <vector>
 
@@ -52,4 +52,4 @@ class ColorChooserAndroid : public content::ColorChooser {
 
 }  // namespace web_contents_delegate_android
 
-#endif  // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_COLOR_CHOOSER_ANDROID_H_
+#endif  // COMPONENTS_EMBEDDER_SUPPORT_ANDROID_DELEGATE_COLOR_CHOOSER_ANDROID_H_

components/embedder_support/android/delegate/web_contents_delegate_android.cc

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/web_contents_delegate_android/web_contents_delegate_android.h"
+#include "components/embedder_support/android/delegate/web_contents_delegate_android.h"
 
 #include <android/keycodes.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
-#include "components/web_contents_delegate_android/color_chooser_android.h"
+#include "components/embedder_support/android/delegate/color_chooser_android.h"
 #include "content/public/browser/color_chooser.h"
 #include "content/public/browser/global_request_id.h"
 #include "content/public/browser/invalidate_type.h"
@@ -38,14 +38,12 @@ using content::WebContentsDelegate;
 namespace web_contents_delegate_android {
 
 WebContentsDelegateAndroid::WebContentsDelegateAndroid(JNIEnv* env, jobject obj)
-    : weak_java_delegate_(env, obj) {
-}
+    : weak_java_delegate_(env, obj) {}
 
-WebContentsDelegateAndroid::~WebContentsDelegateAndroid() {
-}
+WebContentsDelegateAndroid::~WebContentsDelegateAndroid() {}
 
-ScopedJavaLocalRef<jobject>
-WebContentsDelegateAndroid::GetJavaDelegate(JNIEnv* env) const {
+ScopedJavaLocalRef<jobject> WebContentsDelegateAndroid::GetJavaDelegate(
+    JNIEnv* env) const {
   return weak_java_delegate_.get(env);
 }
 
@@ -89,7 +87,7 @@ WebContents* WebContentsDelegateAndroid::OpenURLFromTab(
     ScopedJavaLocalRef<jstring> java_url =
         ConvertUTF8ToJavaString(env, url.spec());
     ScopedJavaLocalRef<jstring> extra_headers =
-            ConvertUTF8ToJavaString(env, params.extra_headers);
+        ConvertUTF8ToJavaString(env, params.extra_headers);
     ScopedJavaLocalRef<jobject> post_data;
     if (params.uses_post && params.post_data) {
       post_data = content::ConvertResourceRequestBodyToJavaObject(
@@ -124,7 +122,8 @@ WebContents* WebContentsDelegateAndroid::OpenURLFromTab(
 }
 
 void WebContentsDelegateAndroid::NavigationStateChanged(
-    WebContents* source, content::InvalidateTypes changed_flags) {
+    WebContents* source,
+    content::InvalidateTypes changed_flags) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
   if (obj.is_null())
@@ -150,7 +149,8 @@ void WebContentsDelegateAndroid::ActivateContents(WebContents* contents) {
   Java_WebContentsDelegateAndroid_activateContents(env, obj);
 }
 
-void WebContentsDelegateAndroid::LoadingStateChanged(WebContents* source,
+void WebContentsDelegateAndroid::LoadingStateChanged(
+    WebContents* source,
     bool to_different_document) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = GetJavaDelegate(env);
@@ -350,7 +350,8 @@ bool WebContentsDelegateAndroid::ShouldBlockMediaRequest(const GURL& url) {
   if (obj.is_null())
     return false;
   ScopedJavaLocalRef<jstring> j_url = ConvertUTF8ToJavaString(env, url.spec());
-  return Java_WebContentsDelegateAndroid_shouldBlockMediaRequest(env, obj, j_url);
+  return Java_WebContentsDelegateAndroid_shouldBlockMediaRequest(env, obj,
+                                                                 j_url);
 }
 
 void WebContentsDelegateAndroid::EnterFullscreenModeForTab(
@@ -384,8 +385,7 @@ bool WebContentsDelegateAndroid::IsFullscreenForTabOrPending(
 }
 
 void WebContentsDelegateAndroid::RequestAppBannerFromDevTools(
-    content::WebContents* web_contents) {
-}
+    content::WebContents* web_contents) {}
 
 void WebContentsDelegateAndroid::OnDidBlockFramebust(
     content::WebContents* web_contents,

components/embedder_support/android/delegate/web_contents_delegate_android.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
-#define COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
+#ifndef COMPONENTS_EMBEDDER_SUPPORT_ANDROID_DELEGATE_WEB_CONTENTS_DELEGATE_ANDROID_H_
+#define COMPONENTS_EMBEDDER_SUPPORT_ANDROID_DELEGATE_WEB_CONTENTS_DELEGATE_ANDROID_H_
 
 #include <stdint.h>
 
@@ -21,7 +21,7 @@ class WebContents;
 class WebContentsDelegate;
 struct NativeWebKeyboardEvent;
 struct OpenURLParams;
-}
+}  // namespace content
 
 namespace web_contents_delegate_android {
 
@@ -36,7 +36,6 @@ enum WebContentsDelegateLogLevel {
   WEB_CONTENTS_DELEGATE_LOG_LEVEL_ERROR = 3,
 };
 
-
 // Native underpinnings of WebContentsDelegateAndroid.java. Provides a default
 // delegate for WebContents to forward calls to the java peer. The embedding
 // application may subclass and override methods on either the C++ or Java side
@@ -103,8 +102,8 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
       const content::NativeWebKeyboardEvent& event) override;
   bool TakeFocus(content::WebContents* source, bool reverse) override;
   void ShowRepostFormWarningDialog(content::WebContents* source) override;
-  base::android::ScopedJavaLocalRef<jobject>
-      GetContentVideoViewEmbedder() override;
+  base::android::ScopedJavaLocalRef<jobject> GetContentVideoViewEmbedder()
+      override;
   bool ShouldBlockMediaRequest(const GURL& url) override;
   void EnterFullscreenModeForTab(
       content::WebContents* web_contents,
@@ -133,4 +132,4 @@ class WebContentsDelegateAndroid : public content::WebContentsDelegate {
 
 }  // namespace web_contents_delegate_android
 
-#endif  // COMPONENTS_WEB_CONTENTS_DELEGATE_ANDROID_WEB_CONTENTS_DELEGATE_ANDROID_H_
+#endif  // COMPONENTS_EMBEDDER_SUPPORT_ANDROID_DELEGATE_WEB_CONTENTS_DELEGATE_ANDROID_H_

components/embedder_support/android/java/res/layout/color_picker_dialog_content.xml

@@ -15,13 +15,13 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <org.chromium.components.web_contents_delegate_android.ColorPickerAdvanced
+        <org.chromium.components.embedder_support.delegate.ColorPickerAdvanced
             android:id="@+id/color_picker_advanced"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </ScrollView>
 
-    <org.chromium.components.web_contents_delegate_android.ColorPickerSimple
+    <org.chromium.components.embedder_support.delegate.ColorPickerSimple
         android:id="@+id/color_picker_simple"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -39,7 +39,7 @@
         android:background="@drawable/color_picker_border"
         android:padding="1px">
 
-        <org.chromium.components.web_contents_delegate_android.ColorPickerMoreButton
+        <org.chromium.components.embedder_support.delegate.ColorPickerMoreButton
             android:id="@+id/more_colors_button"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="match_parent"

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorChooserAndroid.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 import android.content.Context;
 

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorPickerAdvanced.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 import android.content.Context;
 import android.graphics.Color;

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorPickerAdvancedComponent.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 import android.content.Context;
 import android.graphics.drawable.GradientDrawable;

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorPickerDialog.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 import android.app.AlertDialog;
 import android.app.Dialog;

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorPickerMoreButton.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 import android.content.Context;
 import android.graphics.Canvas;

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorPickerSimple.java

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 import android.content.Context;
 import android.graphics.Color;
 import android.util.AttributeSet;
 import android.widget.ListView;
 
-import org.chromium.components.web_contents_delegate_android.ColorSuggestionListAdapter.OnColorSuggestionClickListener;
+import org.chromium.components.embedder_support.delegate.ColorSuggestionListAdapter.OnColorSuggestionClickListener;
 
 /**
  * Draws a grid of (predefined) colors and allows the user to choose one of

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorSuggestion.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 /**
  * Color suggestion container used to store information for each color button that will be shown in

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/ColorSuggestionListAdapter.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 import android.content.Context;
 import android.graphics.Color;

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/OnColorChangedListener.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 /**
  * The callback used to indicate the user changed the color.
@@ -14,4 +14,4 @@ public interface OnColorChangedListener {
      * @param color The color that was set.
      */
     void onColorChanged(int color);
-}
+}

components/embedder_support/android/java/src/org/chromium/components/embedder_support/delegate/WebContentsDelegateAndroid.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.components.web_contents_delegate_android;
+package org.chromium.components.embedder_support.delegate;
 
 import android.view.KeyEvent;
 

components/web_contents_delegate_android/BUILD.gn

@@ -1,114 +0,0 @@
-# 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/rules.gni")
-
-java_strings_grd("web_contents_delegate_android_strings_grd") {
-  grd_file = "java/strings/web_contents_delegate_android_strings.grd"
-  outputs = [
-    "values-am/web_contents_delegate_android_strings.xml",
-    "values-ar/web_contents_delegate_android_strings.xml",
-    "values-bg/web_contents_delegate_android_strings.xml",
-    "values-ca/web_contents_delegate_android_strings.xml",
-    "values-cs/web_contents_delegate_android_strings.xml",
-    "values-da/web_contents_delegate_android_strings.xml",
-    "values-de/web_contents_delegate_android_strings.xml",
-    "values-el/web_contents_delegate_android_strings.xml",
-    "values/web_contents_delegate_android_strings.xml",
-    "values-en-rGB/web_contents_delegate_android_strings.xml",
-    "values-es/web_contents_delegate_android_strings.xml",
-    "values-es-rUS/web_contents_delegate_android_strings.xml",
-    "values-fa/web_contents_delegate_android_strings.xml",
-    "values-fi/web_contents_delegate_android_strings.xml",
-    "values-tl/web_contents_delegate_android_strings.xml",
-    "values-fr/web_contents_delegate_android_strings.xml",
-    "values-hi/web_contents_delegate_android_strings.xml",
-    "values-hr/web_contents_delegate_android_strings.xml",
-    "values-hu/web_contents_delegate_android_strings.xml",
-    "values-in/web_contents_delegate_android_strings.xml",
-    "values-it/web_contents_delegate_android_strings.xml",
-    "values-iw/web_contents_delegate_android_strings.xml",
-    "values-ja/web_contents_delegate_android_strings.xml",
-    "values-ko/web_contents_delegate_android_strings.xml",
-    "values-lt/web_contents_delegate_android_strings.xml",
-    "values-lv/web_contents_delegate_android_strings.xml",
-    "values-nl/web_contents_delegate_android_strings.xml",
-    "values-nb/web_contents_delegate_android_strings.xml",
-    "values-pl/web_contents_delegate_android_strings.xml",
-    "values-pt-rBR/web_contents_delegate_android_strings.xml",
-    "values-pt-rPT/web_contents_delegate_android_strings.xml",
-    "values-ro/web_contents_delegate_android_strings.xml",
-    "values-ru/web_contents_delegate_android_strings.xml",
-    "values-sk/web_contents_delegate_android_strings.xml",
-    "values-sl/web_contents_delegate_android_strings.xml",
-    "values-sr/web_contents_delegate_android_strings.xml",
-    "values-sv/web_contents_delegate_android_strings.xml",
-    "values-sw/web_contents_delegate_android_strings.xml",
-    "values-th/web_contents_delegate_android_strings.xml",
-    "values-tr/web_contents_delegate_android_strings.xml",
-    "values-uk/web_contents_delegate_android_strings.xml",
-    "values-vi/web_contents_delegate_android_strings.xml",
-    "values-zh-rCN/web_contents_delegate_android_strings.xml",
-    "values-zh-rTW/web_contents_delegate_android_strings.xml",
-  ]
-}
-
-static_library("web_contents_delegate_android") {
-  sources = [
-    "color_chooser_android.cc",
-    "color_chooser_android.h",
-    "web_contents_delegate_android.cc",
-    "web_contents_delegate_android.h",
-  ]
-
-  deps = [
-    ":web_contents_delegate_android_jni_headers",
-    "//base",
-    "//content/public/browser",
-    "//content/public/common",
-    "//net",
-    "//skia",
-    "//ui/android",
-    "//ui/base",
-    "//ui/gfx",
-    "//ui/gfx/geometry",
-  ]
-}
-
-android_resources("web_contents_delegate_android_java_resources") {
-  custom_package = "org.chromium.components.web_contents_delegate_android"
-  resource_dirs = [ "java/res" ]
-  deps = [
-    ":web_contents_delegate_android_strings_grd",
-  ]
-}
-
-android_library("web_contents_delegate_android_java") {
-  deps = [
-    ":web_contents_delegate_android_java_resources",
-    "//base:base_java",
-    "//content/public/android:content_java",
-    "//ui/android:ui_java",
-  ]
-  java_files = [
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvanced.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorPickerAdvancedComponent.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorPickerDialog.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorPickerMoreButton.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorPickerSimple.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestion.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorSuggestionListAdapter.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/OnColorChangedListener.java",
-  ]
-}
-
-generate_jni("web_contents_delegate_android_jni_headers") {
-  sources = [
-    "java/src/org/chromium/components/web_contents_delegate_android/ColorChooserAndroid.java",
-    "java/src/org/chromium/components/web_contents_delegate_android/WebContentsDelegateAndroid.java",
-  ]
-  jni_package = "web_contents_delegate_android"
-}

docs/chromoting_android_hacking.md

@@ -54,7 +54,7 @@ display log messages to the `LogCat` pane.
 <classpathentry kind="src" path="components/cronet/android/sample/src"/>
 <classpathentry kind="src" path="components/cronet/android/sample/javatests/src"/>
 <classpathentry kind="src" path="components/autofill/core/browser/android/java/src"/>
-<classpathentry kind="src" path="components/web_contents_delegate_android/java/src"/>
+<classpathentry kind="src" path="components/embedder_support/android/java/src"/>
 <classpathentry kind="src" path="components/dom_distiller/android/java/src"/>
 <classpathentry kind="src" path="components/navigation_interception/android/java/src"/>
 <classpathentry kind="src" path="ui/android/java/src"/>

tools/android/eclipse/.classpath

@@ -78,7 +78,7 @@ to the classpath for downstream development. See "additional_entries" below.
     <classpathentry kind="src" path="components/test/android/browsertests_apk/src"/>
     <classpathentry kind="src" path="components/url_formatter/android/java/src"/>
     <classpathentry kind="src" path="components/variations/android/java/src"/>
-    <classpathentry kind="src" path="components/web_contents_delegate_android/java/src"/>
+    <classpathentry kind="src" path="components/embedder_suppport/android/java/src"/>
     <classpathentry kind="src" path="components/web_restrictions/browser/java/src"/>
     <classpathentry kind="src" path="components/web_restrictions/browser/javatests/src"/>
     <classpathentry kind="src" path="components/web_restrictions/browser/junit/src"/>
@@ -275,7 +275,7 @@ to the classpath for downstream development. See "additional_entries" below.
     <classpathentry kind="lib" path="out/Debug/lib.java/components/service_tab_launcher/service_tab_launcher_java.jar"/>
     <classpathentry kind="lib" path="out/Debug/lib.java/components/signin/core/browser/android/java.jar"/>
     <classpathentry kind="lib" path="out/Debug/lib.java/components/variations/android/variations_java.jar"/>
-    <classpathentry kind="lib" path="out/Debug/lib.java/components/web_contents_delegate_android/web_contents_delegate_android_java.jar"/>
+    <classpathentry kind="lib" path="out/Debug/lib.java/components/embedder_suppport/android/web_contents_delegate_java.jar"/>
     <classpathentry kind="lib" path="out/Debug/lib.java/content/public/android/content_java.jar"/>
     <classpathentry kind="lib" path="out/Debug/lib.java/device/battery/android/battery_monitor_android.jar"/>
     <classpathentry kind="lib" path="out/Debug/lib.java/device/battery/mojo_bindings_java.jar"/>

tools/gritsettings/resource_ids

@@ -188,7 +188,7 @@
   "components/resources/components_scaled_resources.grd": {
     "structures": [17200],
   },
-  "components/web_contents_delegate_android/web_contents_delegate_android_strings.grd": {
+  "components/embedder_suppport/android/java/strings/web_contents_delegate_android_strings.grd": {
     "messages": [17400],
   },
   # END components/ section.