Revert "HaTS: Add HaTS Api Key"
This reverts commit 53451bb279
.
Reason for revert:
Causing CRASHES on builders for several targets
ex: https://ci.chromium.org/ui/p/chrome/builders/ci/linux-chromeos-chrome/35327/blamelist
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
Change-Id: I35bb2a3d0199057073b2c5bdfc0b56c7b70ca25a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4808780
Reviewed-by: Darryl James <dljames@chromium.org>
Auto-Submit: Ana Salazar Maldonado <anasalazar@google.com>
Reviewed-by: Ana Salazar Maldonado <anasalazar@google.com>
Reviewed-by: Joshua Hood <jdh@chromium.org>
Owners-Override: Darryl James <dljames@chromium.org>
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Ana Salazar Maldonado <anasalazar@google.com>
Owners-Override: Ana Salazar Maldonado <anasalazar@google.com>
Cr-Commit-Position: refs/heads/main@{#1187467}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
af8cfb9a83
commit
97a2d885e9
@ -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)
|
||||
|
@ -83,11 +83,6 @@
|
||||
#define GOOGLE_API_KEY_SODA DUMMY_API_TOKEN
|
||||
#endif
|
||||
|
||||
// API key for the HaTS API.
|
||||
#if !defined(GOOGLE_API_KEY_HATS)
|
||||
#define GOOGLE_API_KEY_HATS DUMMY_API_TOKEN
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
// API key for the Nearby Sharing Service.
|
||||
#if !defined(GOOGLE_API_KEY_SHARING)
|
||||
@ -153,10 +148,6 @@ class APIKeyCache {
|
||||
GOOGLE_API_KEY_SODA, STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_SODA),
|
||||
nullptr, std::string(), environment.get(), command_line, gaia_config);
|
||||
|
||||
api_key_hats_ = CalculateKeyValue(
|
||||
GOOGLE_API_KEY_HATS, STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_HATS),
|
||||
nullptr, std::string(), environment.get(), command_line, gaia_config);
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
api_key_sharing_ = CalculateKeyValue(
|
||||
GOOGLE_API_KEY_SHARING, STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_SHARING),
|
||||
@ -228,7 +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_; }
|
||||
std::string api_key_hats() const { return api_key_hats_; }
|
||||
#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_; }
|
||||
@ -338,7 +328,6 @@ class APIKeyCache {
|
||||
std::string api_key_non_stable_;
|
||||
std::string api_key_remoting_;
|
||||
std::string api_key_soda_;
|
||||
std::string api_key_hats_;
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
std::string api_key_sharing_;
|
||||
std::string api_key_read_aloud_;
|
||||
@ -372,10 +361,6 @@ std::string GetSodaAPIKey() {
|
||||
return g_api_key_cache.Get().api_key_soda();
|
||||
}
|
||||
|
||||
std::string GetHatsAPIKey() {
|
||||
return g_api_key_cache.Get().api_key_hats();
|
||||
}
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
std::string GetSharingAPIKey() {
|
||||
return g_api_key_cache.Get().api_key_sharing();
|
||||
|
@ -83,9 +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();
|
||||
|
||||
// Retrieves the HaTS API Key.
|
||||
COMPONENT_EXPORT(GOOGLE_APIS) std::string GetHatsAPIKey();
|
||||
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
// Retrieves the Sharing API Key.
|
||||
COMPONENT_EXPORT(GOOGLE_APIS) std::string GetSharingAPIKey();
|
||||
|
Reference in New Issue
Block a user