chromium/src
0
Fork 0
Code Activity

Revert "Reland "Rename GOOGLE_API_KEY_PHYSICAL_WEB_TEST""

Browse Source 
This reverts commit 19142d792c.

Reason for revert: Suspected culprit for https://crbug.com/1232665

Original change's description:
> Reland "Rename GOOGLE_API_KEY_PHYSICAL_WEB_TEST"
>
> This reverts commit 2dcdca3203.
>
> Reason for revert: This reland fixes the downstream failure. We will create the new api and keep both api keys until the reference to old api in downstream code is replaced. The reference in downstream code depends on upstream code, so it's not possible to change that before this cl has landed
>
>
> Original change's description:
> > Revert "Rename GOOGLE_API_KEY_PHYSICAL_WEB_TEST"
> >
> > This reverts commit fb21652d1b.
> >
> > Reason for revert: Breaking downstream build https://ci.chromium.org/ui/p/chrome/builders/ci/android-internal-chromium-tot/89073/overview
> >
> > Original change's description:
> > > Rename GOOGLE_API_KEY_PHYSICAL_WEB_TEST
> > >
> > > This cl replaces GOOGLE_API_KEY_PHYSICAL_WEB_TEST with
> > > GOOGLE_API_KEY_ANDROID_NON_STABLE as the former is renamed to the latter
> > > one.
> > >
> > > Bug: 1203339
> > > Change-Id: I6006e30b4d5476496b272fa8bb61db15821cbb98
> > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2935543
> > > Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
> > > Reviewed-by: Egor Pasko <pasko@chromium.org>
> > > Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
> > > Cr-Commit-Position: refs/heads/master@{#902436}
> >
> > Bug: 1203339
> > Change-Id: Icf8cf4ab07ed8a98306578c027780733fbf1b3c6
> > No-Presubmit: true
> > No-Tree-Checks: true
> > No-Try: true
> > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3035922
> > Auto-Submit: Sky Malice <skym@chromium.org>
> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
> > Commit-Queue: Sky Malice <skym@chromium.org>
> > Owners-Override: Sky Malice <skym@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#902507}
>
> Bug: 1203339
> Change-Id: I512e521c27d3ef196f378846dd3bac84de7110f8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3041599
> Reviewed-by: Sky Malice <skym@chromium.org>
> Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
> Reviewed-by: Egor Pasko <pasko@chromium.org>
> Commit-Queue: Tanmoy Mollik <triploblastic@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#904704}

Bug: 1203339, 1232665
Change-Id: I3344c0aa7a04489a39cd7091ad74590b9ff5be52
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3050858
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Reviewed-by: Krishna Govind <govind@chromium.org>
Owners-Override: Krishna Govind <govind@chromium.org>
Commit-Queue: Krishna Govind <govind@chromium.org>
Commit-Queue: Nate Fischer <ntfschr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#905069}
This commit is contained in:
Nate Fischer
2021-07-24 23:32:12 +00:00
committed by Chromium LUCI CQ
parent 3784e03a95
commit 51d9acabbf
3 changed files with 2 additions and 13 deletions

2
build/android/gyp/java_google_api_keys.py

@ -97,8 +97,6 @@ def _DoMain(argv):
values['GOOGLE_API_KEY'] = google_api_keys.GetAPIKey()
values['GOOGLE_API_KEY_PHYSICAL_WEB_TEST'] = (google_api_keys.
GetAPIKeyPhysicalWebTest())
values['GOOGLE_API_KEY_ANDROID_NON_STABLE'] = (
google_api_keys.GetAPIKeyAndroidNonStable())
values['GOOGLE_CLIENT_ID_MAIN'] = google_api_keys.GetClientID('MAIN')
values['GOOGLE_CLIENT_SECRET_MAIN'] = google_api_keys.GetClientSecret('MAIN')
values['GOOGLE_CLIENT_ID_CLOUD_PRINT'] = google_api_keys.GetClientID(

8
google_apis/google_api_keys.cc

@ -81,10 +81,6 @@
#define GOOGLE_API_KEY_PHYSICAL_WEB_TEST DUMMY_API_TOKEN
#endif
#if !defined(GOOGLE_API_KEY_ANDROID_NON_STABLE)
#define GOOGLE_API_KEY_ANDROID_NON_STABLE DUMMY_API_TOKEN
#endif
#if !defined(GOOGLE_API_KEY_REMOTING)
#define GOOGLE_API_KEY_REMOTING DUMMY_API_TOKEN
#endif
@ -136,8 +132,8 @@ class APIKeyCache {
// A special non-stable key is at the moment defined only for Android Chrome.
#if defined(OS_ANDROID)
api_key_non_stable_ = CalculateKeyValue(
GOOGLE_API_KEY_ANDROID_NON_STABLE,
STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_ANDROID_NON_STABLE), nullptr,
GOOGLE_API_KEY_PHYSICAL_WEB_TEST,
STRINGIZE_NO_EXPANSION(GOOGLE_API_KEY_PHYSICAL_WEB_TEST), nullptr,
std::string(), environment.get(), command_line, gaia_config);
#else
api_key_non_stable_ = api_key_;

5
google_apis/google_api_keys.py

@ -77,11 +77,6 @@ def GetAPIKeyPhysicalWebTest():
return _GetToken('GOOGLE_API_KEY_PHYSICAL_WEB_TEST')
def GetAPIKeyAndroidNonStable():
"""Returns the API key for non-stable Android."""
return _GetToken('GOOGLE_API_KEY_ANDROID_NON_STABLE')
def GetClientID(client_name):
"""Returns the OAuth 2.0 client ID for the client of the given name."""
return _GetToken('GOOGLE_CLIENT_ID_%s' % client_name)