Clean up unused feature flags in Assistant

This CL cleans up the disabled feature flags for Assistant not currently
in use, specifically |kEnableClearCutLog|.

This CL also cleans up some code missed in chromium:2207860 which was a
related CL that did a similar clean-up of the launched feature flags
instead.

Bug: b:156993255
Test: Does not change behavior
Change-Id: I3624e3fd15934c3b5bf0dcae43fc58c49d92281d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2210324Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Commit-Queue: Abhijeet Singh <siabhijeet@google.com>
Cr-Commit-Position: refs/heads/master@{#770825}

chromeos/services/assistant/public/cpp/features.cc

@@ -78,9 +78,6 @@ const base::Feature kAssistantTimersV2{"AssistantTimersV2",
 const base::Feature kAssistantWaitScheduling{"AssistantWaitScheduling",
                                              base::FEATURE_ENABLED_BY_DEFAULT};
 
-const base::Feature kEnableClearCutLog{"EnableClearCutLog",
-                                       base::FEATURE_DISABLED_BY_DEFAULT};
-
 const base::Feature kEnableDspHotword{"EnableDspHotword",
                                       base::FEATURE_DISABLED_BY_DEFAULT};
 
@@ -131,10 +128,6 @@ bool IsAudioEraserEnabled() {
   return base::FeatureList::IsEnabled(kAssistantAudioEraser);
 }
 
-bool IsClearCutLogEnabled() {
-  return base::FeatureList::IsEnabled(kEnableClearCutLog);
-}
-
 bool IsConversationStartersV2Enabled() {
   return base::FeatureList::IsEnabled(kAssistantConversationStartersV2);
 }

chromeos/services/assistant/public/cpp/features.h

@@ -71,10 +71,6 @@ extern const base::Feature kAssistantTimersV2;
 COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
 extern const base::Feature kAssistantWaitScheduling;
 
-// Enables clear cut logging.
-COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
-extern const base::Feature kEnableClearCutLog;
-
 // Enables DSP for hotword detection.
 COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
 extern const base::Feature kEnableDspHotword;
@@ -115,15 +111,11 @@ COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsAppSupportEnabled();
 
 COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsAudioEraserEnabled();
 
-COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsClearCutLogEnabled();
-
 COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
 bool IsConversationStartersV2Enabled();
 
 COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsDspHotwordEnabled();
 
-COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsFeedbackUiEnabled();
-
 COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC)
 bool IsLauncherChipIntegrationEnabled();
 
@@ -158,8 +150,6 @@ COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsVoiceMatchDisabled();
 
 COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsWaitSchedulingEnabled();
 
-COMPONENT_EXPORT(ASSISTANT_SERVICE_PUBLIC) bool IsWarmerWelcomeEnabled();
-
 }  // namespace features
 }  // namespace assistant
 }  // namespace chromeos

chromeos/services/assistant/service.cc

@@ -63,7 +63,6 @@ using CommunicationErrorType = AssistantManagerService::CommunicationErrorType;
 constexpr char kScopeAuthGcm[] = "https://www.googleapis.com/auth/gcm";
 constexpr char kScopeAssistant[] =
     "https://www.googleapis.com/auth/assistant-sdk-prototype";
-constexpr char kScopeClearCutLog[] = "https://www.googleapis.com/auth/cclog";
 constexpr char kScopeGeller[] = "https://www.googleapis.com/auth/webhistory";
 
 constexpr base::TimeDelta kMinTokenRefreshDelay =
@@ -468,9 +467,6 @@ void Service::RequestAccessToken() {
   signin::ScopeSet scopes;
   scopes.insert(kScopeAssistant);
   scopes.insert(kScopeAuthGcm);
-  if (features::IsClearCutLogEnabled())
-    scopes.insert(kScopeClearCutLog);
-
   if (features::IsOnDeviceAssistantEnabled())
     scopes.insert(kScopeGeller);