Cleanup and extend some sharing flags.

* Remove shared-clipboard-receiver (enabled by default)
* Extend shared-clipboard-ui
* Extend sharing-derive-vapid-key
* Extend click-to-call-ui

Change-Id: I6434cae0855c2834e44175a31123419d5ea7f3b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2068601Reviewed-by: Richard Knoll <knollr@chromium.org>
Commit-Queue: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743921}

chrome/browser/about_flags.cc

@@ -3878,11 +3878,6 @@ const FeatureEntry kFeatureEntries[] = {
 #endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ||
         // defined(OS_CHROMEOS)
 
-    {"shared-clipboard-receiver",
-     flag_descriptions::kSharedClipboardReceiverName,
-     flag_descriptions::kSharedClipboardReceiverDescription, kOsAll,
-     FEATURE_VALUE_TYPE(kSharedClipboardReceiver)},
-
     {"shared-clipboard-ui", flag_descriptions::kSharedClipboardUIName,
      flag_descriptions::kSharedClipboardUIDescription, kOsAll,
      FEATURE_VALUE_TYPE(kSharedClipboardUI)},

chrome/browser/flag-metadata.json

@@ -485,7 +485,7 @@
   {
     "name": "click-to-call-ui",
     "owners": [ "//chrome/browser/sharing/OWNERS" ],
-    "expiry_milestone": 82
+    "expiry_milestone": 85
   },
   {
     "name": "click-to-open-pdf",
@@ -3267,12 +3267,12 @@
   {
     "name": "shared-clipboard-ui",
     "owners": [ "//chrome/browser/sharing/OWNERS" ],
-    "expiry_milestone": 82
+    "expiry_milestone": 85
   },
   {
     "name": "sharing-derive-vapid-key",
     "owners": [ "//chrome/browser/sharing/OWNERS" ],
-    "expiry_milestone": 82
+    "expiry_milestone": 85
   },
   {
     "name": "sharing-device-expiration",

chrome/browser/flag_descriptions.cc

@@ -1677,12 +1677,6 @@ const char kServiceWorkerOnUIDescription[] =
     "Enables browser process logic related to service workers to run on the UI "
     "thread rather than the IO thread.";
 
-const char kSharedClipboardReceiverName[] =
-    "Enable receiver device to handle shared clipboard feature";
-const char kSharedClipboardReceiverDescription[] =
-    "Enables receiver device to handle shared clipboard feature by showing a "
-    "notification to receive the clipboard to share.";
-
 const char kSharedClipboardUIName[] =
     "Enable shared clipboard feature signals to be handled";
 const char kSharedClipboardUIDescription[] =

chrome/browser/flag_descriptions.h

@@ -977,9 +977,6 @@ extern const char kSendTabToSelfWhenSignedInDescription[];
 extern const char kServiceWorkerOnUIName[];
 extern const char kServiceWorkerOnUIDescription[];
 
-extern const char kSharedClipboardReceiverName[];
-extern const char kSharedClipboardReceiverDescription[];
-
 extern const char kSharedClipboardUIName[];
 extern const char kSharedClipboardUIDescription[];
 

chrome/browser/sharing/shared_clipboard/feature_flags.cc

@@ -4,9 +4,6 @@
 
 #include "chrome/browser/sharing/shared_clipboard/feature_flags.h"
 
-const base::Feature kSharedClipboardReceiver{"SharedClipboardReceiver",
-                                             base::FEATURE_ENABLED_BY_DEFAULT};
-
 const base::Feature kSharedClipboardUI{"SharedClipboardUI",
                                        base::FEATURE_DISABLED_BY_DEFAULT};
 

chrome/browser/sharing/shared_clipboard/feature_flags.h

@@ -11,9 +11,6 @@
 #include "base/metrics/field_trial_params.h"
 #include "build/build_config.h"
 
-// Feature to allow devices to receive the shared clipboard message.
-extern const base::Feature kSharedClipboardReceiver;
-
 // Feature to allow shared clipboard gets processed.
 extern const base::Feature kSharedClipboardUI;
 

chrome/browser/sharing/sharing_device_registration.cc

@@ -316,7 +316,7 @@ bool SharingDeviceRegistration::IsSharedClipboardSupported() const {
       !pref_service_->GetBoolean(prefs::kSharedClipboardEnabled)) {
     return false;
   }
-  return base::FeatureList::IsEnabled(kSharedClipboardReceiver);
+  return true;
 }
 
 bool SharingDeviceRegistration::IsSmsFetcherSupported() const {

chrome/browser/sharing/sharing_device_registration_unittest.cc

@@ -16,7 +16,6 @@
 #include "base/test/task_environment.h"
 #include "build/build_config.h"
 #include "chrome/browser/sharing/features.h"
-#include "chrome/browser/sharing/shared_clipboard/feature_flags.h"
 #include "chrome/browser/sharing/sharing_constants.h"
 #include "chrome/browser/sharing/sharing_device_registration_result.h"
 #include "chrome/browser/sharing/sharing_sync_preference.h"
@@ -160,10 +159,6 @@ class SharingDeviceRegistrationTest : public testing::Test {
     pref_service_->SetBoolean(prefs::kSharedClipboardEnabled, val);
   }
 
-  void EnableSharedClipboardReceiverFlag() {
-    scoped_feature_list_.InitAndEnableFeature(kSharedClipboardReceiver);
-  }
-
   void RegisterDeviceSync() {
     base::RunLoop run_loop;
     sharing_device_registration_.RegisterDevice(
@@ -247,14 +242,12 @@ class SharingDeviceRegistrationTest : public testing::Test {
 
 TEST_F(SharingDeviceRegistrationTest, IsSharedClipboardSupported_True) {
   SetSharedClipboardPolicy(true);
-  EnableSharedClipboardReceiverFlag();
 
   EXPECT_TRUE(sharing_device_registration_.IsSharedClipboardSupported());
 }
 
 TEST_F(SharingDeviceRegistrationTest, IsSharedClipboardSupported_False) {
   SetSharedClipboardPolicy(false);
-  EnableSharedClipboardReceiverFlag();
 
   EXPECT_FALSE(sharing_device_registration_.IsSharedClipboardSupported());
 }