Remove kShareCanonicalURL experiment flag.

Feature was launched in M64.

Bug: 820975
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: Ie8deeda24708509caafde53a3a908bbe1ee84376
Reviewed-on: https://chromium-review.googlesource.com/959041Reviewed-by: Justin Cohen <justincohen@chromium.org>
Commit-Queue: Peter Lee <pkl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#542923}

ios/chrome/browser/BUILD.gn

@@ -122,7 +122,6 @@ source_set("browser") {
     "//ios/chrome/browser/ssl:features",
     "//ios/chrome/browser/sync/glue",
     "//ios/chrome/browser/ui:feature_flags",
-    "//ios/chrome/browser/ui/activity_services:features",
     "//ios/chrome/browser/ui/coordinators:chrome_coordinators",
     "//ios/chrome/browser/ui/external_search:features",
     "//ios/chrome/browser/ui/history:history_base_feature",

ios/chrome/browser/about_flags.mm

@@ -43,7 +43,6 @@
 #include "ios/chrome/browser/ios_chrome_flag_descriptions.h"
 #include "ios/chrome/browser/mailto/features.h"
 #include "ios/chrome/browser/ssl/captive_portal_features.h"
-#include "ios/chrome/browser/ui/activity_services/canonical_url_feature.h"
 #include "ios/chrome/browser/ui/external_search/features.h"
 #import "ios/chrome/browser/ui/history/history_base_feature.h"
 #include "ios/chrome/browser/ui/main/main_feature_flags.h"
@@ -203,9 +202,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
     {"new-file-download", flag_descriptions::kNewFileDownloadName,
      flag_descriptions::kNewFileDownloadDescription, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(web::features::kNewFileDownload)},
-    {"ios-share-canonical-url", flag_descriptions::kShareCanonicalURLName,
-     flag_descriptions::kShareCanonicalURLDescription, flags_ui::kOsIos,
-     FEATURE_VALUE_TYPE(activity_services::kShareCanonicalURL)},
     {"memex-tab-switcher", flag_descriptions::kMemexTabSwitcherName,
      flag_descriptions::kMemexTabSwitcherDescription, flags_ui::kOsIos,
      FEATURE_VALUE_TYPE(kMemexTabSwitcher)},

ios/chrome/browser/ios_chrome_flag_descriptions.cc

@@ -101,11 +101,6 @@ const char kCollectionsUIRebootName[] = "Collections UI Reboot";
 const char kCollectionsUIRebootDescription[] =
     "When enabled, Collections will use the new UI Reboot stack.";
 
-const char kShareCanonicalURLName[] = "Share Canonical URL";
-const char kShareCanonicalURLDescription[] =
-    "When enabled, the current page's canonical URL is shared (if it exists) "
-    "instead of the visible URL.";
-
 const char kSlimNavigationManagerName[] = "Use Slim Navigation Manager";
 const char kSlimNavigationManagerDescription[] =
     "When enabled, uses the experimental slim navigation manager that provides "

ios/chrome/browser/ios_chrome_flag_descriptions.h

@@ -90,11 +90,6 @@ extern const char kPhysicalWebDescription[];
 extern const char kCollectionsUIRebootName[];
 extern const char kCollectionsUIRebootDescription[];
 
-// Title and description for the flag to share the canonical URL of the
-// current page instead of the visible URL.
-extern const char kShareCanonicalURLName[];
-extern const char kShareCanonicalURLDescription[];
-
 // Title and description for the flag to enable WKBackForwardList based
 // navigation manager.
 extern const char kSlimNavigationManagerName[];

ios/chrome/browser/ui/activity_services/BUILD.gn

@@ -63,7 +63,6 @@ source_set("coordinator") {
   ]
   deps = [
     ":activity_services",
-    ":features",
     "//base",
     "//ios/chrome/browser",
     "//ios/chrome/browser/browser_state",
@@ -133,14 +132,3 @@ source_set("eg_tests") {
   ]
   libs = [ "XCTest.framework" ]
 }
-
-source_set("features") {
-  configs += [ "//build/config/compiler:enable_arc" ]
-  sources = [
-    "canonical_url_feature.cc",
-    "canonical_url_feature.h",
-  ]
-  deps = [
-    "//base",
-  ]
-}

ios/chrome/browser/ui/activity_services/activity_service_legacy_coordinator.mm

@@ -11,7 +11,6 @@
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/ui/activity_services/activity_service_controller.h"
-#import "ios/chrome/browser/ui/activity_services/canonical_url_feature.h"
 #import "ios/chrome/browser/ui/activity_services/canonical_url_retriever.h"
 #import "ios/chrome/browser/ui/activity_services/requirements/activity_service_password.h"
 #import "ios/chrome/browser/ui/activity_services/requirements/activity_service_positioner.h"
@@ -85,15 +84,11 @@ const char kSharePageLatencyHistogram[] = "IOS.SharePageLatency";
 
 - (void)sharePage {
   self.sharePageStartTime = base::TimeTicks::Now();
-  if (!base::FeatureList::IsEnabled(activity_services::kShareCanonicalURL)) {
-    [self sharePageWithCanonicalURL:GURL::EmptyGURL()];
-  } else {
-    __weak ActivityServiceLegacyCoordinator* weakSelf = self;
-    activity_services::RetrieveCanonicalUrl(
-        self.tabModel.currentTab.webState, ^(const GURL& url) {
-          [weakSelf sharePageWithCanonicalURL:url];
-        });
-  }
+  __weak ActivityServiceLegacyCoordinator* weakSelf = self;
+  activity_services::RetrieveCanonicalUrl(
+      self.tabModel.currentTab.webState, ^(const GURL& url) {
+        [weakSelf sharePageWithCanonicalURL:url];
+      });
 }
 
 #pragma mark - Providers

ios/chrome/browser/ui/activity_services/canonical_url_feature.cc

-// Copyright 2017 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 "ios/chrome/browser/ui/activity_services/canonical_url_feature.h"
-
-namespace activity_services {
-
-const base::Feature kShareCanonicalURL{"ShareCanonicalURLIOS",
-                                       base::FEATURE_ENABLED_BY_DEFAULT};
-
-}  // namespace activity_services

ios/chrome/browser/ui/activity_services/canonical_url_feature.h

-// Copyright 2017 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.
-
-#ifndef IOS_CHROME_BROWSER_UI_ACTIVITY_SERVICES_CANONICAL_URL_FEATURE_H_
-#define IOS_CHROME_BROWSER_UI_ACTIVITY_SERVICES_CANONICAL_URL_FEATURE_H_
-
-#include "base/feature_list.h"
-
-namespace activity_services {
-
-// Used to control whether the canonical URL is shared if available.
-extern const base::Feature kShareCanonicalURL;
-
-}  // namespace activity_services
-
-#endif  // IOS_CHROME_BROWSER_UI_ACTIVITY_SERVICES_CANONICAL_URL_FEATURE_H_