Force FeedbackKit to use V2 implementation.

FeedbackKit V2 launched in M67. In order to deprecate the V1
implementation, the first step needs to force the chrome://flags to
true and then implementation code can be removed.

Bug: 847329
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I9451fa04453584d6e056e82f8c9f323d0a87c06c
Reviewed-on: https://chromium-review.googlesource.com/1119355Reviewed-by: Sergio Collazos <sczs@chromium.org>
Commit-Queue: Peter Lee <pkl@chromium.org>
Cr-Commit-Position: refs/heads/master@{#571542}

ios/chrome/browser/about_flags.mm

@@ -54,7 +54,6 @@
 #include "ios/chrome/browser/ui/main/main_feature_flags.h"
 #import "ios/chrome/browser/ui/toolbar/public/features.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
-#include "ios/chrome/browser/ui/user_feedback_features.h"
 #include "ios/chrome/browser/web/features.h"
 #include "ios/chrome/grit/ios_strings.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
@@ -286,13 +285,6 @@ const flags_ui::FeatureEntry kFeatureEntries[] = {
      flag_descriptions::kMailtoHandlingWithGoogleUIName,
      flag_descriptions::kMailtoHandlingWithGoogleUIDescription,
      flags_ui::kOsIos, FEATURE_VALUE_TYPE(kMailtoHandledWithGoogleUI)},
-    {"feedback-kit-v2", flag_descriptions::kFeedbackKitV2Name,
-     flag_descriptions::kFeedbackKitV2Description, flags_ui::kOsIos,
-     FEATURE_VALUE_TYPE(kFeedbackKitV2)},
-    {"feedback-kit-v2-sso-service",
-     flag_descriptions::kFeedbackKitV2WithSSOServiceName,
-     flag_descriptions::kFeedbackKitV2WithSSOServiceDescription,
-     flags_ui::kOsIos, FEATURE_VALUE_TYPE(kFeedbackKitV2WithSSOService)},
     {"new-clear-browsing-data-ui",
      flag_descriptions::kNewClearBrowsingDataUIName,
      flag_descriptions::kNewClearBrowsingDataUIDescription, flags_ui::kOsIos,

ios/chrome/browser/experimental_flags.mm

@@ -25,7 +25,6 @@
 #include "ios/chrome/browser/browsing_data/browsing_data_features.h"
 #include "ios/chrome/browser/chrome_switches.h"
 #include "ios/chrome/browser/ui/ui_feature_flags.h"
-#include "ios/chrome/browser/ui/user_feedback_features.h"
 #include "ios/web/public/web_view_creation_util.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
@@ -114,11 +113,11 @@ bool IsNewClearBrowsingDataUIEnabled() {
 }
 
 bool IsNewFeedbackKitEnabled() {
-  return base::FeatureList::IsEnabled(kFeedbackKitV2);
+  return true;
 }
 
 bool IsNewFeedbackKitEnabledWithSSOService() {
-  return base::FeatureList::IsEnabled(kFeedbackKitV2WithSSOService);
+  return true;
 }
 
 bool IsThirdPartyKeyboardWorkaroundEnabled() {

ios/chrome/browser/ios_chrome_flag_descriptions.cc

@@ -140,13 +140,6 @@ const char kNewClearBrowsingDataUIDescription[] =
 const char kExternalSearchName[] = "External Search";
 const char kExternalSearchDescription[] = "Enable support for External Search.";
 
-const char kFeedbackKitV2Name[] = "FeedbackKit V2";
-const char kFeedbackKitV2Description[] = "Enable use of FeedbackKit V2.";
-const char kFeedbackKitV2WithSSOServiceName[] =
-    "FeedbackKit V2 with SSOService configured for FeedbackKit";
-const char kFeedbackKitV2WithSSOServiceDescription[] =
-    "Send SSOService with configuration for FeedbackKit V2.";
-
 const char kFullscreenViewportAdjustmentExperimentName[] =
     "Fullscreen Viewport Adjustment Mode";
 const char kFullscreenViewportAdjustmentExperimentDescription[] =

ios/chrome/browser/ios_chrome_flag_descriptions.h

@@ -117,12 +117,6 @@ extern const char kNewClearBrowsingDataUIDescription[];
 extern const char kExternalSearchName[];
 extern const char kExternalSearchDescription[];
 
-// Title and description for the flags to enable use of FeedbackKit V2.
-extern const char kFeedbackKitV2Name[];
-extern const char kFeedbackKitV2Description[];
-extern const char kFeedbackKitV2WithSSOServiceName[];
-extern const char kFeedbackKitV2WithSSOServiceDescription[];
-
 // Title and description for the command line switch used to determine the
 // active fullscreen viewport adjustment mode.
 extern const char kFullscreenViewportAdjustmentExperimentName[];

ios/chrome/browser/ui/BUILD.gn

@@ -88,8 +88,6 @@ source_set("feature_flags") {
   sources = [
     "ui_feature_flags.cc",
     "ui_feature_flags.h",
-    "user_feedback_features.cc",
-    "user_feedback_features.h",
   ]
   deps = [
     "//base",

ios/chrome/browser/ui/settings/settings_navigation_controller.mm

@@ -167,9 +167,6 @@ newUserFeedbackController:(ios::ChromeBrowserState*)browserState
       initWithRootViewController:controller
                     browserState:browserState
                         delegate:delegate];
-  if (!experimental_flags::IsNewFeedbackKitEnabled()) {
-    [controller navigationItem].rightBarButtonItem = [nc cancelButton];
-  }
   return nc;
 }
 

ios/chrome/browser/ui/user_feedback_features.cc

-// 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.
-
-#include "ios/chrome/browser/ui/user_feedback_features.h"
-
-const base::Feature kFeedbackKitV2{"FeedbackKitV2",
-                                   base::FEATURE_ENABLED_BY_DEFAULT};
-
-const base::Feature kFeedbackKitV2WithSSOService{
-    "FeedbackKitV2WithSSOService", base::FEATURE_ENABLED_BY_DEFAULT};

ios/chrome/browser/ui/user_feedback_features.h

-// 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.
-
-#ifndef IOS_CHROME_BROWSER_UI_USER_FEEDBACK_FEATURES_H_
-#define IOS_CHROME_BROWSER_UI_USER_FEEDBACK_FEATURES_H_
-
-#include "base/feature_list.h"
-
-// Feature flag to enable FeedbackKit V2
-extern const base::Feature kFeedbackKitV2;
-
-// Feature flag to send SSOService to FeedbackKit V2. This feature flag is
-// used only if kFeedbackKitV2 is enabled.
-extern const base::Feature kFeedbackKitV2WithSSOService;
-
-#endif  // IOS_CHROME_BROWSER_UI_USER_FEEDBACK_FEATURES_H_