From 1abac7ad4a3da14065cfc2c1c14841f223cf324c Mon Sep 17 00:00:00 2001 From: "joi@chromium.org" Date: Thu, 31 Jan 2013 14:01:25 +0000 Subject: [PATCH] Remove temporary keys. See http://chromium.org/developers/how-tos/api-keys. BUG=145584 Review URL: https://chromiumcodereview.appspot.com/12091043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179878 0039d316-1c4b-4281-b951-d872f2087c98 --- google_apis/google_api_keys.cc | 13 ++----- google_apis/google_api_keys_unittest.cc | 47 +++++++++++-------------- 2 files changed, 24 insertions(+), 36 deletions(-) diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc index 5b11247f87540c..97ef31a692dcf4 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc @@ -38,10 +38,7 @@ #define DUMMY_API_TOKEN "dummytoken" #if !defined(GOOGLE_API_KEY) -// TODO(joi): This is temporary; switch to DUMMY_API_TOKEN once people -// have had some time to install API keys per -// http://chromium.org/developers/how-tos/api-keys -#define GOOGLE_API_KEY "AIzaSyBHDrl33hwRp4rMQY0ziRbj8K9LPA6vUCY" +#define GOOGLE_API_KEY DUMMY_API_TOKEN #endif #if !defined(GOOGLE_CLIENT_ID_MAIN) @@ -73,15 +70,11 @@ // variables. If set, they will be used to replace any of the client // IDs and secrets above that have not been set (and only those; they // will not override already-set values). -// -// TODO(joi): This is temporary; make both blank once people have had -// some time to install API keys per -// http://chromium.org/developers/how-tos/api-keys #if !defined(GOOGLE_DEFAULT_CLIENT_ID) -#define GOOGLE_DEFAULT_CLIENT_ID "609716072145.apps.googleusercontent.com" +#define GOOGLE_DEFAULT_CLIENT_ID "" #endif #if !defined(GOOGLE_DEFAULT_CLIENT_SECRET) -#define GOOGLE_DEFAULT_CLIENT_SECRET "WF4uG3gJzEH0KLpS7OuFBDux" +#define GOOGLE_DEFAULT_CLIENT_SECRET "" #endif namespace switches { diff --git a/google_apis/google_api_keys_unittest.cc b/google_apis/google_api_keys_unittest.cc index a733bfce4b28bf..0ed52d6aeae2e2 100644 --- a/google_apis/google_api_keys_unittest.cc +++ b/google_apis/google_api_keys_unittest.cc @@ -37,13 +37,8 @@ #include "base/memory/scoped_ptr.h" #include "base/stringize_macros.h" -// These are the (temporary) default values for OAuth IDs and secrets. -static const char kDefaultNonOfficialAPIKey[] = - "AIzaSyBHDrl33hwRp4rMQY0ziRbj8K9LPA6vUCY"; -static const char kDefaultNonOfficialClientID[] = - "609716072145.apps.googleusercontent.com"; -static const char kDefaultNonOfficialClientSecret[] = - "WF4uG3gJzEH0KLpS7OuFBDux"; +// This is the default baked-in value for OAuth IDs and secrets. +static const char kDummyToken[] = "dummytoken"; struct EnvironmentCache { public: @@ -157,32 +152,32 @@ TEST_F(GoogleAPIKeysTest, OfficialKeys) { EXPECT_NE(0u, api_key.size()); EXPECT_NE(DUMMY_API_TOKEN, api_key); EXPECT_NE("bogus api_key", api_key); - EXPECT_NE(kDefaultNonOfficialAPIKey, api_key); + EXPECT_NE(kDummyToken, api_key); EXPECT_NE(0u, id_main.size()); EXPECT_NE(DUMMY_API_TOKEN, id_main); EXPECT_NE("bogus client_id_main", id_main); - EXPECT_NE(kDefaultNonOfficialClientID, id_main); + EXPECT_NE(kDummyToken, id_main); EXPECT_NE(0u, secret_main.size()); EXPECT_NE(DUMMY_API_TOKEN, secret_main); - EXPECT_NE(kDefaultNonOfficialClientSecret, secret_main); + EXPECT_NE(kDummyToken, secret_main); EXPECT_NE(0u, id_cloud_print.size()); EXPECT_NE(DUMMY_API_TOKEN, id_cloud_print); - EXPECT_NE(kDefaultNonOfficialClientID, id_cloud_print); + EXPECT_NE(kDummyToken, id_cloud_print); EXPECT_NE(0u, secret_cloud_print.size()); EXPECT_NE(DUMMY_API_TOKEN, secret_cloud_print); - EXPECT_NE(kDefaultNonOfficialClientSecret, secret_cloud_print); + EXPECT_NE(kDummyToken, secret_cloud_print); EXPECT_NE(0u, id_remoting.size()); EXPECT_NE(DUMMY_API_TOKEN, id_remoting); - EXPECT_NE(kDefaultNonOfficialClientID, id_remoting); + EXPECT_NE(kDummyToken, id_remoting); EXPECT_NE(0u, secret_remoting.size()); EXPECT_NE(DUMMY_API_TOKEN, secret_remoting); - EXPECT_NE(kDefaultNonOfficialClientSecret, secret_remoting); + EXPECT_NE(kDummyToken, secret_remoting); } #endif // defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS) @@ -234,13 +229,13 @@ TEST_F(GoogleAPIKeysTest, DefaultKeys) { testcase::g_api_key_cache.Get().GetClientSecret( testcase::CLIENT_REMOTING); - EXPECT_EQ(kDefaultNonOfficialAPIKey, api_key); - EXPECT_EQ(kDefaultNonOfficialClientID, id_main); - EXPECT_EQ(kDefaultNonOfficialClientSecret, secret_main); - EXPECT_EQ(kDefaultNonOfficialClientID, id_cloud_print); - EXPECT_EQ(kDefaultNonOfficialClientSecret, secret_cloud_print); - EXPECT_EQ(kDefaultNonOfficialClientID, id_remoting); - EXPECT_EQ(kDefaultNonOfficialClientSecret, secret_remoting); + EXPECT_EQ(kDummyToken, api_key); + EXPECT_EQ(kDummyToken, id_main); + EXPECT_EQ(kDummyToken, secret_main); + EXPECT_EQ(kDummyToken, id_cloud_print); + EXPECT_EQ(kDummyToken, secret_cloud_print); + EXPECT_EQ(kDummyToken, id_remoting); + EXPECT_EQ(kDummyToken, secret_remoting); } // Override a couple of keys, leave the rest default. @@ -290,12 +285,12 @@ TEST_F(GoogleAPIKeysTest, OverrideSomeKeys) { testcase::CLIENT_REMOTING); EXPECT_EQ("API_KEY override", api_key); - EXPECT_EQ(kDefaultNonOfficialClientID, id_main); - EXPECT_EQ(kDefaultNonOfficialClientSecret, secret_main); - EXPECT_EQ(kDefaultNonOfficialClientID, id_cloud_print); - EXPECT_EQ(kDefaultNonOfficialClientSecret, secret_cloud_print); + EXPECT_EQ(kDummyToken, id_main); + EXPECT_EQ(kDummyToken, secret_main); + EXPECT_EQ(kDummyToken, id_cloud_print); + EXPECT_EQ(kDummyToken, secret_cloud_print); EXPECT_EQ("CLIENT_ID_REMOTING override", id_remoting); - EXPECT_EQ(kDefaultNonOfficialClientSecret, secret_remoting); + EXPECT_EQ(kDummyToken, secret_remoting); } // Override all keys.