Revert "Reland "HaTS: Add HaTS Api Key""

This reverts commit 8475f68315.

Reason for revert: chromeos linux emulator crashes on startup

Original change's description:
> Reland "HaTS: Add HaTS Api Key"
>
> This is a reland of commit 53451bb279
>
> Original change's description:
> > HaTS: Add HaTS Api Key
> >
> > Bug: 1121586, b/291043820
> > Change-Id: I6fc2db36b61d1ec4fefedf69c380aec196707032
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4683948
> > Commit-Queue: Ehimare Okoyomon <eokoyomon@chromium.org>
> > Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1187261}
>
> Bug: 1121586, b/291043820, 1475428
> Change-Id: I66e5d709c342dff35068a69f4dc0cba369aee5e3
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4808127
> Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
> Commit-Queue: Ehimare Okoyomon <eokoyomon@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1188271}

Bug: 1121586, b/291043820, 1475428
Change-Id: Ied2bd6b2a4930e86500d0bd8e4c53f4a214a28fa
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4813466
Auto-Submit: Artsiom Mitrokhin <amitrokhin@chromium.org>
Reviewed-by: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Ana Salazar Maldonado <anasalazar@google.com>
Commit-Queue: Ana Salazar Maldonado <anasalazar@google.com>
Owners-Override: Ana Salazar Maldonado <anasalazar@google.com>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Cr-Commit-Position: refs/heads/main@{#1188371}

chrome/browser/ui/webui/hats/hats_ui.cc

@@ -12,7 +12,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
-#include "google_apis/google_api_keys.h"
 
 HatsUIConfig::HatsUIConfig()
     : WebUIConfig(content::kChromeUIUntrustedScheme,
@@ -37,8 +36,6 @@ HatsUI::HatsUI(content::WebUI* web_ui) : ui::UntrustedWebUIController(web_ui) {
   webui::SetupWebUIDataSource(
       source, base::make_span(kHatsResources, kHatsResourcesSize),
       IDR_HATS_HATS_HTML);
-
-  source->AddString("hatsApiKey", google_apis::GetHatsAPIKey());
 }
 
 WEB_UI_CONTROLLER_TYPE_IMPL(HatsUI)

google_apis/google_api_keys.cc

@@ -83,13 +83,6 @@
 #define GOOGLE_API_KEY_SODA DUMMY_API_TOKEN
 #endif
 
-#if !BUILDFLAG(IS_ANDROID)
-// API key for the HaTS API.
-#if !defined(GOOGLE_API_KEY_HATS)
-#define GOOGLE_API_KEY_HATS DUMMY_API_TOKEN
-#endif
-#endif
-
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 // API key for the Nearby Sharing Service.
 #if !defined(GOOGLE_API_KEY_SHARING)
@@ -154,11 +147,6 @@ class APIKeyCache {
     api_key_soda_ = CalculateKeyValue(
         GOOGLE_API_KEY_SODA, STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_SODA),
         nullptr, std::string(), environment.get(), command_line, gaia_config);
-#if !BUILDFLAG(IS_ANDROID)
-    api_key_hats_ = CalculateKeyValue(
-        GOOGLE_API_KEY_HATS, STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_HATS),
-        nullptr, std::string(), environment.get(), command_line, gaia_config);
-#endif
 
 #if BUILDFLAG(IS_CHROMEOS_ASH)
     api_key_sharing_ = CalculateKeyValue(
@@ -231,9 +219,6 @@ class APIKeyCache {
   std::string api_key_non_stable() const { return api_key_non_stable_; }
   std::string api_key_remoting() const { return api_key_remoting_; }
   std::string api_key_soda() const { return api_key_soda_; }
-#if !BUILDFLAG(IS_ANDROID)
-  std::string api_key_hats() const { return api_key_hats_; }
-#endif
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   std::string api_key_sharing() const { return api_key_sharing_; }
   std::string api_key_read_aloud() const { return api_key_read_aloud_; }
@@ -343,9 +328,6 @@ class APIKeyCache {
   std::string api_key_non_stable_;
   std::string api_key_remoting_;
   std::string api_key_soda_;
-#if !BUILDFLAG(IS_ANDROID)
-  std::string api_key_hats_;
-#endif
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   std::string api_key_sharing_;
   std::string api_key_read_aloud_;
@@ -379,12 +361,6 @@ std::string GetSodaAPIKey() {
   return g_api_key_cache.Get().api_key_soda();
 }
 
-#if !BUILDFLAG(IS_ANDROID)
-std::string GetHatsAPIKey() {
-  return g_api_key_cache.Get().api_key_hats();
-}
-#endif
-
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 std::string GetSharingAPIKey() {
   return g_api_key_cache.Get().api_key_sharing();

google_apis/google_api_keys.h

@@ -83,12 +83,6 @@ COMPONENT_EXPORT(GOOGLE_APIS) std::string GetRemotingAPIKey();
 // Retrieves the Speech On-Device API (SODA) API Key.
 COMPONENT_EXPORT(GOOGLE_APIS) std::string GetSodaAPIKey();
 
-#if !BUILDFLAG(IS_ANDROID)
-// Retrieves the HaTS API Key. This key is only used for desktop HaTS
-// and the internal API Key is only defined in non-Android builds.
-COMPONENT_EXPORT(GOOGLE_APIS) std::string GetHatsAPIKey();
-#endif
-
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 // Retrieves the Sharing API Key.
 COMPONENT_EXPORT(GOOGLE_APIS) std::string GetSharingAPIKey();