Bug 1294585 - Remove the --with-google-oauth-api-keyfile configure flag. r=mikedeboer
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -282,17 +282,16 @@ def old_configure_options(*options):
'--with-default-mozilla-five-home',
'--with-distribution-id',
'--with-doc-include-dirs',
'--with-doc-input-dirs',
'--with-doc-output-dir',
'--with-float-abi',
'--with-fpu',
'--with-google-api-keyfile',
- '--with-google-oauth-api-keyfile',
'--with-intl-api',
'--with-ios-sdk',
'--with-jitreport-granularity',
'--with-linux-headers',
'--with-macbundlename-prefix',
'--with-macos-private-frameworks',
'--with-macos-sdk',
'--with-mozilla-api-keyfile',
--- a/old-configure.in
+++ b/old-configure.in
@@ -2433,29 +2433,16 @@ AC_SUBST(MOZ_MOZILLA_API_KEY)
MOZ_ARG_WITH_STRING(google-api-keyfile,
[ --with-google-api-keyfile=file Use the secret key contained in the given keyfile for Google API requests],
MOZ_GOOGLE_API_KEY=`cat $withval`)
if test -z "$MOZ_GOOGLE_API_KEY"; then
MOZ_GOOGLE_API_KEY=no-google-api-key
fi
AC_SUBST(MOZ_GOOGLE_API_KEY)
-# Allow to specify a Google OAuth API key file that contains the client ID and
-# the secret key to be used for various Google OAuth API requests.
-MOZ_ARG_WITH_STRING(google-oauth-api-keyfile,
-[ --with-google-oauth-api-keyfile=file Use the client id and secret key contained in the given keyfile for Google OAuth API requests],
- [MOZ_GOOGLE_OAUTH_API_CLIENTID=`cat $withval | cut -f 1 -d " "`
- MOZ_GOOGLE_OAUTH_API_KEY=`cat $withval | cut -f 2 -d " "`])
-if test -z "$MOZ_GOOGLE_OAUTH_API_CLIENTID"; then
- MOZ_GOOGLE_OAUTH_API_CLIENTID=no-google-oauth-api-clientid
- MOZ_GOOGLE_OAUTH_API_KEY=no-google-oauth-api-key
-fi
-AC_SUBST(MOZ_GOOGLE_OAUTH_API_CLIENTID)
-AC_SUBST(MOZ_GOOGLE_OAUTH_API_KEY)
-
# Allow specifying a Bing API key file that contains the client ID and the
# secret key to be used for the Bing Translation API requests.
MOZ_ARG_WITH_STRING(bing-api-keyfile,
[ --with-bing-api-keyfile=file Use the client id and secret key contained in the given keyfile for Bing API requests],
[MOZ_BING_API_CLIENTID=`cat $withval | cut -f 1 -d " "`
MOZ_BING_API_KEY=`cat $withval | cut -f 2 -d " "`])
if test -z "$MOZ_BING_API_CLIENTID"; then
MOZ_BING_API_CLIENTID=no-bing-api-clientid
--- a/toolkit/components/urlformatter/api_keys.in
+++ b/toolkit/components/urlformatter/api_keys.in
@@ -1,6 +1,4 @@
#define MOZ_MOZILLA_API_KEY @MOZ_MOZILLA_API_KEY@
#define MOZ_GOOGLE_API_KEY @MOZ_GOOGLE_API_KEY@
-#define MOZ_GOOGLE_OAUTH_API_KEY @MOZ_GOOGLE_OAUTH_API_KEY@
-#define MOZ_GOOGLE_OAUTH_API_CLIENTID @MOZ_GOOGLE_OAUTH_API_CLIENTID@
#define MOZ_BING_API_KEY @MOZ_BING_API_KEY@
#define MOZ_BING_API_CLIENTID @MOZ_BING_API_CLIENTID@
--- a/toolkit/components/urlformatter/nsURLFormatter.js
+++ b/toolkit/components/urlformatter/nsURLFormatter.js
@@ -111,18 +111,16 @@ nsURLFormatterService.prototype = {
APP: function() { return this.appInfo.name.toLowerCase().replace(/ /, ""); },
OS: function() { return this.appInfo.OS; },
XPCOMABI: function() { return this.ABI; },
BUILD_TARGET: function() { return this.appInfo.OS + "_" + this.ABI; },
OS_VERSION: function() { return this.OSVersion; },
CHANNEL: () => UpdateUtils.UpdateChannel,
MOZILLA_API_KEY: () => "@MOZ_MOZILLA_API_KEY@",
GOOGLE_API_KEY: () => "@MOZ_GOOGLE_API_KEY@",
- GOOGLE_OAUTH_API_CLIENTID:() => "@MOZ_GOOGLE_OAUTH_API_CLIENTID@",
- GOOGLE_OAUTH_API_KEY: () => "@MOZ_GOOGLE_OAUTH_API_KEY@",
BING_API_CLIENTID:() => "@MOZ_BING_API_CLIENTID@",
BING_API_KEY: () => "@MOZ_BING_API_KEY@",
DISTRIBUTION: function() { return this.distribution.id; },
DISTRIBUTION_VERSION: function() { return this.distribution.version; }
},
formatURL: function uf_formatURL(aFormat) {
var _this = this;