Bluetooth Scanning: Remove duplicate C++ enums in BluetoothScanningPromptAndroid

This CL removes the duplicate C++ enums in the
BluetoothScanningPromptAndroid and use the enums in
BluetoothScanningPrompt.

Bug: 994399
Change-Id: I038fe4b8346c5a1f04e045893704ec44d91dba9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1758937Reviewed-by: Matt Falkenhagen <falken@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Jun Cai <juncai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688329}

chrome/android/BUILD.gn

@@ -579,7 +579,6 @@ java_cpp_enum("chrome_android_java_enums_srcjar") {
     "//chrome/browser/ntp_snippets/ntp_snippets_metrics.h",
     "//chrome/browser/profiles/profile_metrics.h",
     "//chrome/browser/translate/android/translate_utils.h",
-    "//chrome/browser/ui/android/device_dialog/bluetooth_scanning_prompt_android.h",
     "//chrome/browser/ui/android/infobars/infobar_android.h",
   ]
 }

chrome/android/java/src/org/chromium/chrome/browser/device_dialog/BluetoothScanningPermissionDialog.java

@@ -30,6 +30,7 @@ import org.chromium.chrome.browser.ChromeBaseAppCompatActivity;
 import org.chromium.chrome.browser.omnibox.OmniboxUrlEmphasizer;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.util.MathUtils;
+import org.chromium.content_public.browser.bluetooth_scanning.Event;
 import org.chromium.ui.base.DeviceFormFactor;
 import org.chromium.ui.base.WindowAndroid;
 import org.chromium.ui.widget.TextViewWithClickableSpans;
@@ -149,7 +150,7 @@ public class BluetoothScanningPermissionDialog {
         blockButton.setText(blockButtonText);
         blockButton.setEnabled(true);
         blockButton.setOnClickListener(v -> {
-            finishDialog(BluetoothScanningPermissionEvent.BLOCK);
+            finishDialog(Event.BLOCK);
             mDialog.setOnDismissListener(null);
             mDialog.dismiss();
         });
@@ -158,7 +159,7 @@ public class BluetoothScanningPermissionDialog {
         allowButton.setText(allowButtonText);
         allowButton.setEnabled(true);
         allowButton.setOnClickListener(v -> {
-            finishDialog(BluetoothScanningPermissionEvent.ALLOW);
+            finishDialog(Event.ALLOW);
             mDialog.setOnDismissListener(null);
             mDialog.dismiss();
         });
@@ -229,8 +230,7 @@ public class BluetoothScanningPermissionDialog {
         mDialog.addContentView(view,
                 new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
                         LinearLayout.LayoutParams.MATCH_PARENT));
-        mDialog.setOnCancelListener(
-                dialog -> finishDialog(BluetoothScanningPermissionEvent.CANCELED));
+        mDialog.setOnCancelListener(dialog -> finishDialog(Event.CANCELED));
 
         Window window = mDialog.getWindow();
         if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {

chrome/android/javatests/src/org/chromium/chrome/browser/device_dialog/BluetoothScanningPermissionDialogTest.java

@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.test.ChromeActivityTestRule;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
+import org.chromium.content_public.browser.bluetooth_scanning.Event;
 import org.chromium.content_public.browser.test.util.Criteria;
 import org.chromium.content_public.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
@@ -120,7 +121,6 @@ public class BluetoothScanningPermissionDialogTest {
 
         dialog.cancel();
 
-        CriteriaHelper.pollUiThread(Criteria.equals(
-                BluetoothScanningPermissionEvent.CANCELED, () -> mFinishedEventType));
+        CriteriaHelper.pollUiThread(Criteria.equals(Event.CANCELED, () -> mFinishedEventType));
     }
 }

chrome/browser/ui/android/device_dialog/bluetooth_scanning_prompt_android.h

@@ -15,14 +15,6 @@
 // devices. This implementation is for Android.
 class BluetoothScanningPromptAndroid : public content::BluetoothScanningPrompt {
  public:
-  // A Java counterpart will be generated for this enum.
-  // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser.device_dialog
-  enum BluetoothScanningPermissionEvent {
-    ALLOW = 0,
-    BLOCK = 1,
-    CANCELED = 2,
-  };
-
   BluetoothScanningPromptAndroid(
       content::RenderFrameHost* frame,
       const content::BluetoothScanningPrompt::EventHandler& event_handler);

content/public/android/BUILD.gn

@@ -361,6 +361,7 @@ java_cpp_enum("content_public_android_java_enums_srcjar") {
     "//content/browser/android/select_popup.cc",
     "//content/public/browser/android/child_process_importance.h",
     "//content/public/browser/android/motion_event_action.h",
+    "//content/public/browser/bluetooth_scanning_prompt.h",
     "//content/public/browser/browser_task_traits.h",
     "//content/public/browser/browsing_data_remover.h",
     "//content/public/browser/invalidate_type.h",

content/public/browser/bluetooth_scanning_prompt.h

@@ -17,6 +17,9 @@ namespace content {
 // Bluetooth advertisement packets from Bluetooth devices.
 class CONTENT_EXPORT BluetoothScanningPrompt {
  public:
+  // A Java counterpart will be generated for this enum.
+  // GENERATED_JAVA_ENUM_PACKAGE: (
+  //   org.chromium.content_public.browser.bluetooth_scanning)
   enum class Event {
     kAllow,
     kBlock,