0

Reland "cros-geo-apikey: Update ChromeOS surfaces to use new API keys"

This reverts commit 31a89b88e6.

Reason for revert: google_internal needed a manual roll up - https://chromium-review.googlesource.com/c/chromium/src/+/6401294

Original change's description:
> Revert "cros-geo-apikey: Update ChromeOS surfaces to use new API keys"
>
> This reverts commit f1341b6f55.
>
> Reason for revert: many crashing tests when is_chrome_branded is set
> b/406579271
>
> Original change's description:
> > cros-geo-apikey: Update ChromeOS surfaces to use new API keys
> >
> > Introduce new methods for ChromeOS to access the ChromeOS-specific GCP
> > API keys. Update the `SimpleGeolocationRequest` and
> > `ChromeContentBrowserClient` to use these new keys instead.
> >
> > Bug: 394051078
> > Change-Id: I36b6995b3bfb7edd81ac63d785c0a8946101137b
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6361503
> > Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
> > Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
> > Commit-Queue: Zauri Meshveliani <zauri@chromium.org>
> > Cr-Commit-Position: refs/heads/main@{#1438300}
>
> Bug: 394051078, 406579271
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Change-Id: Ie920746087812a1fd118b66031e7bd42cf8c210f
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6399493
> Auto-Submit: Joel Hockey <joelhockey@chromium.org>
> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> Owners-Override: Joel Hockey <joelhockey@chromium.org>
> Cr-Commit-Position: refs/heads/main@{#1438546}

Bug: 394051078, 406579271
Change-Id: I53f5a383a367c1a21b32ce899dbb9e635049a11a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6401295
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Owners-Override: Joel Hockey <joelhockey@chromium.org>
Commit-Queue: Joel Hockey <joelhockey@chromium.org>
Reviewed-by: Joel Hockey <joelhockey@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1438987}
This commit is contained in:
Zauri Meshveliani
2025-03-27 13:53:57 -07:00
committed by Chromium LUCI CQ
parent 2e07460bc0
commit b41301a2a3
12 changed files with 221 additions and 2 deletions

@ -113,6 +113,14 @@ COMPONENT_EXPORT(GOOGLE_APIS) const std::string& GetFresnelAPIKey();
// Retrieves the Boca API Key.
COMPONENT_EXPORT(GOOGLE_APIS) const std::string& GetBocaAPIKey();
// Retrieves the ChromeOS-specific Geolocation API Key used by the System
// Services.
COMPONENT_EXPORT(GOOGLE_APIS) const std::string& GetCrosSystemGeoAPIKey();
// Retrieves the ChromeOS-specific Geolocation API Key used by the Chrome
// browser.
COMPONENT_EXPORT(GOOGLE_APIS) const std::string& GetCrosChromeGeoAPIKey();
#endif
// Retrieves the key used to sign metrics (UMA/UKM) uploads.