Delete ContextualSuggestions prototypes, SuggestionsBottomSheetContent

Remove dead code associated with old prototypes for the contextual
suggestions carousel and bottom sheet content section. Also remove
SuggestionsBottomSheetContent and associated resources.

Adds a new flag for ContextualSuggestionsBottomSheet to replace the removed
flags.

BUG=822842,814528

Change-Id: Ie76371cbb0528f3759e8f85eba90148b2e4e61b7
Reviewed-on: https://chromium-review.googlesource.com/967274
Commit-Queue: Theresa <[email protected]>
Reviewed-by: Steven Holte <[email protected]>
Reviewed-by: Bernhard Bauer <[email protected]>
Cr-Commit-Position: refs/heads/master@{#544773}
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index af8f692..9e541eb 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -2509,15 +2509,11 @@
      flag_descriptions::kEnableNtpSnippetsVisibilityName,
      flag_descriptions::kEnableNtpSnippetsVisibilityDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(ntp_snippets::kIncreasedVisibility)},
-    {"enable-contextual-suggestions-above-articles",
-     flag_descriptions::kContextualSuggestionsAboveArticlesName,
-     flag_descriptions::kContextualSuggestionsAboveArticlesDescription,
+    {"enable-contextual-suggestions-bottom-sheet",
+     flag_descriptions::kContextualSuggestionsBottomSheetName,
+     flag_descriptions::kContextualSuggestionsBottomSheetDescription,
      kOsAndroid,
-     FEATURE_VALUE_TYPE(chrome::android::kContextualSuggestionsAboveArticles)},
-    {"enable-contextual-suggestions-carousel",
-     flag_descriptions::kContextualSuggestionsCarouselName,
-     flag_descriptions::kContextualSuggestionsCarouselDescription, kOsAndroid,
-     FEATURE_VALUE_TYPE(chrome::android::kContextualSuggestionsCarousel)},
+     FEATURE_VALUE_TYPE(chrome::android::kContextualSuggestionsBottomSheet)},
     {"enable-content-suggestions-new-favicon-server",
      flag_descriptions::kEnableContentSuggestionsNewFaviconServerName,
      flag_descriptions::kEnableContentSuggestionsNewFaviconServerDescription,