0

Revert "[google_apis] Allow overriding use_official_google_api_keys"

This reverts commit 0ae6b65b32.

Reason for revert: crbug.com/1358960

Original change's description:
> [google_apis] Allow overriding use_official_google_api_keys
>
> Previously, is_chrome_branded would override a false value. Fix that and
> update the C++ logic to be compatible. Retains the existing behavior
> for iOS only due to iOS issue https://crbug.com/1171510, which caused
> the previous attempt, https://crrev.com/c/2657805, to be reverted.
>
> Bug: 1294915, 1183709
> Change-Id: I68d8babe6461a91117396488b2a27772c9952f80
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3756721
> Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
> Commit-Queue: David Dorwin <ddorwin@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1041234}

Bug: 1294915, 1183709
Change-Id: I192d4b59097f5db2218447a7983d216b910850a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3864681
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Rohit Agarwal <roagarwal@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1042202}
This commit is contained in:
Rohit Agarwal
2022-09-01 18:15:36 +00:00
committed by Chromium LUCI CQ
parent d534d736f4
commit fc90637961
3 changed files with 26 additions and 52 deletions

@ -89,8 +89,7 @@ std::string GetReadAloudAPIKey();
// Retrieves the Fresnel API Key.
std::string GetFresnelAPIKey();
#if BUILDFLAG(IS_IOS) || \
(BUILDFLAG(IS_FUCHSIA) && !defined(USE_OFFICIAL_GOOGLE_API_KEYS))
#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA)
// Sets the API key. This should be called as early as possible before this
// API key is even accessed. It must be called before GetAPIKey.
// TODO(https://crbug.com/1166007): Enforce this is called before GetAPIKey.