Adding unit tests for google_api_keys functionality.

TBR=ben@chromium.org
BUG=145584


Review URL: https://chromiumcodereview.appspot.com/10941034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157972 0039d316-1c4b-4281-b951-d872f2087c98

chrome/chrome_tests.gypi

@@ -959,6 +959,7 @@
         '../sync/sync.gyp:test_support_syncapi_service',
         'test_support_unit',
         # 3) anything tests directly depend on
+        '../google_apis/google_apis.gyp:google_apis',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
         '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalidation',
@@ -976,9 +977,6 @@
         'common/extensions/api/api.gyp:api',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
-        # TODO(joi): Move these to their own unittest executable?
-        '../google_apis/google_apis.gyp:google_apis',
-        '../google_apis/google_apis.gyp:google_apis_unittests',
       ],
       'include_dirs': [
         '..',
@@ -2100,6 +2098,21 @@
         '../ash/test/test_launcher_delegate.cc',
         '../ash/test/test_launcher_delegate.h',
         '../ash/test/test_shell_delegate.cc',
+        # TODO(joi): Move the google_apis tests to a separate
+        # google_apis_unittests executable.
+        '../google_apis/google_api_keys_unittest.cc',
+        '../google_apis/gaia/mock_url_fetcher_factory.h',
+        '../google_apis/gaia/gaia_auth_fetcher_unittest.cc',
+        '../google_apis/gaia/gaia_auth_util_unittest.cc',
+        '../google_apis/gaia/gaia_authenticator_unittest.cc',
+        '../google_apis/gaia/gaia_oauth_client_unittest.cc',
+        '../google_apis/gaia/google_service_auth_error_unittest.cc',
+        '../google_apis/gaia/oauth_request_signer_unittest.cc',
+        '../google_apis/gaia/oauth2_access_token_fetcher_unittest.cc',
+        '../google_apis/gaia/oauth2_api_call_flow_unittest.cc',
+        '../google_apis/gaia/oauth2_mint_token_fetcher_unittest.cc',
+        '../google_apis/gaia/oauth2_mint_token_flow_unittest.cc',
+        '../google_apis/gaia/oauth2_revocation_fetcher_unittest.cc',
         '../skia/ext/bitmap_platform_device_mac_unittest.cc',
         '../skia/ext/convolver_unittest.cc',
         '../skia/ext/image_operations_unittest.cc',
@@ -2618,6 +2631,11 @@
             '../content/common/socket_stream_dispatcher.cc',
           ]},
         ],
+        # TODO(joi): Remove from this file once separate
+        # google_apis_unittests target is established.
+        ['use_official_google_api_keys==1', {
+          'defines': ['USE_OFFICIAL_GOOGLE_API_KEYS=1'],
+        }],
       ],
     },
     {

google_apis/google_api_keys.cc

@@ -94,8 +94,6 @@ const char kOAuth2ClientSecret[] = "oauth2-client-secret";
 
 namespace google_apis {
 
-namespace {
-
 // This is used as a lazy instance to determine keys once and cache them.
 class APIKeyCache {
  public:
@@ -239,8 +237,6 @@ class APIKeyCache {
 static base::LazyInstance<APIKeyCache> g_api_key_cache =
     LAZY_INSTANCE_INITIALIZER;
 
-}  // namespace
-
 std::string GetAPIKey() {
   return g_api_key_cache.Get().api_key();
 }

google_apis/google_api_keys_unittest.cc

@@ -10,15 +10,97 @@
 // This is a little unorthodox, but it lets us test the behavior as
 // close to unmodified as possible.
 
+#include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace {
+// The Win builders fail (with a linker crash) when trying to link
+// unit_tests, and the Android builders complain about multiply
+// defined symbols (likely they don't do name decoration as well as
+// the Mac and Linux linkers).  Therefore these tests are only built
+// and run on Mac and Linux, which should provide plenty of coverage
+// since there are no platform-specific bits in this code.
+#if defined(OS_LINUX) || defined(OS_MACOSX)
 
-#if defined(GOOGLE_CHROME_BUILD) or defined(USE_OFFICIAL_GOOGLE_API_KEYS)
+// We need to include this once at global scope so things like STL and
+// classes from base do not get defined again within the different
+// namespaces below.
+#include "google_apis/google_api_keys.cc"
+
+// 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";
+
+struct EnvironmentCache {
+ public:
+  EnvironmentCache() : variable_name(NULL), was_set(false) {}
+
+  const char* variable_name;
+  bool was_set;
+  std::string value;
+};
+
+class GoogleAPIKeysTest : public testing::Test {
+ public:
+  GoogleAPIKeysTest() : env_(base::Environment::Create()) {
+    env_cache_[0].variable_name = "GOOGLE_API_KEY";
+    env_cache_[1].variable_name = "GOOGLE_CLIENT_ID_MAIN";
+    env_cache_[2].variable_name = "GOOGLE_CLIENT_SECRET_MAIN";
+    env_cache_[3].variable_name = "GOOGLE_CLIENT_ID_CLOUD_PRINT";
+    env_cache_[4].variable_name = "GOOGLE_CLIENT_SECRET_CLOUD_PRINT";
+    env_cache_[5].variable_name = "GOOGLE_CLIENT_ID_REMOTING";
+    env_cache_[6].variable_name = "GOOGLE_CLIENT_SECRET_REMOTING";
+    env_cache_[7].variable_name = "GOOGLE_DEFAULT_CLIENT_ID";
+    env_cache_[8].variable_name = "GOOGLE_DEFAULT_CLIENT_SECRET";
+  }
+
+  void SetUp() {
+    // Unset all environment variables that can affect these tests,
+    // for the duration of the tests.
+    for (size_t i = 0; i < arraysize(env_cache_); ++i) {
+      EnvironmentCache& cache = env_cache_[i];
+      cache.was_set = env_->HasVar(cache.variable_name);
+      cache.value.clear();
+      if (cache.was_set) {
+        env_->GetVar(cache.variable_name, &cache.value);
+        env_->UnSetVar(cache.variable_name);
+      }
+    }
+  }
+
+  void TearDown() {
+    // Restore environment.
+    for (size_t i = 0; i < arraysize(env_cache_); ++i) {
+      EnvironmentCache& cache = env_cache_[i];
+      if (cache.was_set) {
+        env_->SetVar(cache.variable_name, cache.value);
+      }
+    }
+  }
+
+ private:
+  scoped_ptr<base::Environment> env_;
+
+  // Why 3?  It is for GOOGLE_API_KEY, GOOGLE_DEFAULT_CLIENT_ID and
+  // GOOGLE_DEFAULT_CLIENT_SECRET.
+  //
+  // Why 2 times CLIENT_NUM_ITEMS?  This is the number of different
+  // clients in the OAuth2Client enumeration, and for each of these we
+  // have both an ID and a secret.
+  EnvironmentCache env_cache_[3 + 2 * google_apis::CLIENT_NUM_ITEMS];
+};
+
+#if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS)
 // Test official build behavior, since we are in a checkout where this
 // is possible.
 namespace official_build {
 
+// We start every test by creating a clean environment for the
+// preprocessor defines used in google_api_keys.cc
+#undef DUMMY_API_TOKEN
 #undef GOOGLE_API_KEY
 #undef GOOGLE_CLIENT_ID_MAIN
 #undef GOOGLE_CLIENT_SECRET_MAIN
@@ -26,31 +108,315 @@ namespace official_build {
 #undef GOOGLE_CLIENT_SECRET_CLOUD_PRINT
 #undef GOOGLE_CLIENT_ID_REMOTING
 #undef GOOGLE_CLIENT_SECRET_REMOTING
+#undef GOOGLE_DEFAULT_CLIENT_ID
+#undef GOOGLE_DEFAULT_CLIENT_SECRET
 
 // Try setting some keys, these should be ignored since it's a build
 // with official keys.
-#define GOOGLE_API_KEY "bogus api key"
+#define GOOGLE_API_KEY "bogus api_key"
 #define GOOGLE_CLIENT_ID_MAIN "bogus client_id_main"
 
+// Undef include guard so things get defined again, within this namespace.
+#undef GOOGLE_APIS_GOOGLE_API_KEYS_H_
+#undef GOOGLE_APIS_INTERNAL_GOOGLE_CHROME_API_KEYS_
 #include "google_apis/google_api_keys.cc"
 
-TEST(GoogleAPIKeys, OfficialKeys) {
-  std::string api_key = g_api_key_cache.Get().api_key();
-  std::string id_main = g_api_key_cache.Get().GetClientID(CLIENT_MAIN);
-  std::string secret_main = g_api_key_cache.Get().GetClientSecret(CLIENT_MAIN);
-  std::string id_cloud_print =
-      g_api_key_cache.Get().GetClientID(CLIENT_CLOUD_PRINT);
-  std::string secret_cloud_print =
-      g_api_key_cache.Get().GetClientSecret(CLIENT_CLOUD_PRINT);
-  std::string id_remoting = g_api_key_cache.Get().GetClientID(CLIENT_REMOTING);
-  std::string secret_remoting =
-      g_api_key_cache.Get().GetClientSecret(CLIENT_REMOTING);
+}  // namespace official_build
 
-  ASSERT_TRUE(api_key.size() == 0);
+TEST_F(GoogleAPIKeysTest, OfficialKeys) {
+  namespace testcase = official_build::google_apis;
+
+  std::string api_key = testcase::g_api_key_cache.Get().api_key();
+  std::string id_main = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_MAIN);
+  std::string secret_main = testcase::g_api_key_cache.Get().GetClientSecret(
+      testcase::CLIENT_MAIN);
+  std::string id_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientID(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string secret_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string id_remoting = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_REMOTING);
+  std::string secret_remoting =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          testcase::CLIENT_REMOTING);
+
+  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(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(0u, secret_main.size());
+  EXPECT_NE(DUMMY_API_TOKEN, secret_main);
+  EXPECT_NE(kDefaultNonOfficialClientSecret, 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(0u, secret_cloud_print.size());
+  EXPECT_NE(DUMMY_API_TOKEN, secret_cloud_print);
+  EXPECT_NE(kDefaultNonOfficialClientSecret, secret_cloud_print);
+
+  EXPECT_NE(0u, id_remoting.size());
+  EXPECT_NE(DUMMY_API_TOKEN, id_remoting);
+  EXPECT_NE(kDefaultNonOfficialClientID, id_remoting);
+
+  EXPECT_NE(0u, secret_remoting.size());
+  EXPECT_NE(DUMMY_API_TOKEN, secret_remoting);
+  EXPECT_NE(kDefaultNonOfficialClientSecret, secret_remoting);
+}
+#endif  // defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS)
+
+// After this test, for the remainder of this compilation unit, we
+// need official keys to not be used.
+#undef GOOGLE_CHROME_BUILD
+#undef USE_OFFICIAL_GOOGLE_API_KEYS
+
+// Test the set of keys temporarily baked into Chromium by default.
+namespace default_keys {
+
+// We start every test by creating a clean environment for the
+// preprocessor defines used in google_api_keys.cc
+#undef DUMMY_API_TOKEN
+#undef GOOGLE_API_KEY
+#undef GOOGLE_CLIENT_ID_MAIN
+#undef GOOGLE_CLIENT_SECRET_MAIN
+#undef GOOGLE_CLIENT_ID_CLOUD_PRINT
+#undef GOOGLE_CLIENT_SECRET_CLOUD_PRINT
+#undef GOOGLE_CLIENT_ID_REMOTING
+#undef GOOGLE_CLIENT_SECRET_REMOTING
+#undef GOOGLE_DEFAULT_CLIENT_ID
+#undef GOOGLE_DEFAULT_CLIENT_SECRET
+
+// Undef include guard so things get defined again, within this namespace.
+#undef GOOGLE_APIS_GOOGLE_API_KEYS_H_
+#undef GOOGLE_APIS_INTERNAL_GOOGLE_CHROME_API_KEYS_
+#include "google_apis/google_api_keys.cc"
+
+}  // namespace default_keys
+
+TEST_F(GoogleAPIKeysTest, DefaultKeys) {
+  namespace testcase = default_keys::google_apis;
+
+  std::string api_key = testcase::g_api_key_cache.Get().api_key();
+  std::string id_main = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_MAIN);
+  std::string secret_main = testcase::g_api_key_cache.Get().GetClientSecret(
+      testcase::CLIENT_MAIN);
+  std::string id_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientID(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string secret_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string id_remoting = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_REMOTING);
+  std::string secret_remoting =
+      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);
 }
 
-}  // namespace official_build
-#endif  // defined(GOOGLE_CHROME_BUILD) or defined(USE_OFFICIAL_GOOGLE_API_KEYS)
+// Override a couple of keys, leave the rest default.
+namespace override_some_keys {
 
+// We start every test by creating a clean environment for the
+// preprocessor defines used in google_api_keys.cc
+#undef DUMMY_API_TOKEN
+#undef GOOGLE_API_KEY
+#undef GOOGLE_CLIENT_ID_MAIN
+#undef GOOGLE_CLIENT_SECRET_MAIN
+#undef GOOGLE_CLIENT_ID_CLOUD_PRINT
+#undef GOOGLE_CLIENT_SECRET_CLOUD_PRINT
+#undef GOOGLE_CLIENT_ID_REMOTING
+#undef GOOGLE_CLIENT_SECRET_REMOTING
+#undef GOOGLE_DEFAULT_CLIENT_ID
+#undef GOOGLE_DEFAULT_CLIENT_SECRET
 
-}  // namespace
+#define GOOGLE_API_KEY "API_KEY override"
+#define GOOGLE_CLIENT_ID_REMOTING "CLIENT_ID_REMOTING override"
+
+// Undef include guard so things get defined again, within this namespace.
+#undef GOOGLE_APIS_GOOGLE_API_KEYS_H_
+#undef GOOGLE_APIS_INTERNAL_GOOGLE_CHROME_API_KEYS_
+#include "google_apis/google_api_keys.cc"
+
+}  // namespace override_some_keys
+
+TEST_F(GoogleAPIKeysTest, OverrideSomeKeys) {
+  namespace testcase = override_some_keys::google_apis;
+
+  std::string api_key = testcase::g_api_key_cache.Get().api_key();
+  std::string id_main = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_MAIN);
+  std::string secret_main = testcase::g_api_key_cache.Get().GetClientSecret(
+      testcase::CLIENT_MAIN);
+  std::string id_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientID(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string secret_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string id_remoting = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_REMOTING);
+  std::string secret_remoting =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          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("CLIENT_ID_REMOTING override", id_remoting);
+  EXPECT_EQ(kDefaultNonOfficialClientSecret, secret_remoting);
+}
+
+// Override all keys.
+namespace override_all_keys {
+
+// We start every test by creating a clean environment for the
+// preprocessor defines used in google_api_keys.cc
+#undef DUMMY_API_TOKEN
+#undef GOOGLE_API_KEY
+#undef GOOGLE_CLIENT_ID_MAIN
+#undef GOOGLE_CLIENT_SECRET_MAIN
+#undef GOOGLE_CLIENT_ID_CLOUD_PRINT
+#undef GOOGLE_CLIENT_SECRET_CLOUD_PRINT
+#undef GOOGLE_CLIENT_ID_REMOTING
+#undef GOOGLE_CLIENT_SECRET_REMOTING
+#undef GOOGLE_DEFAULT_CLIENT_ID
+#undef GOOGLE_DEFAULT_CLIENT_SECRET
+
+#define GOOGLE_API_KEY "API_KEY"
+#define GOOGLE_CLIENT_ID_MAIN "ID_MAIN"
+#define GOOGLE_CLIENT_SECRET_MAIN "SECRET_MAIN"
+#define GOOGLE_CLIENT_ID_CLOUD_PRINT "ID_CLOUD_PRINT"
+#define GOOGLE_CLIENT_SECRET_CLOUD_PRINT "SECRET_CLOUD_PRINT"
+#define GOOGLE_CLIENT_ID_REMOTING "ID_REMOTING"
+#define GOOGLE_CLIENT_SECRET_REMOTING "SECRET_REMOTING"
+
+// Undef include guard so things get defined again, within this namespace.
+#undef GOOGLE_APIS_GOOGLE_API_KEYS_H_
+#undef GOOGLE_APIS_INTERNAL_GOOGLE_CHROME_API_KEYS_
+#include "google_apis/google_api_keys.cc"
+
+}  // namespace override_all_keys
+
+TEST_F(GoogleAPIKeysTest, OverrideAllKeys) {
+  namespace testcase = override_all_keys::google_apis;
+
+  std::string api_key = testcase::g_api_key_cache.Get().api_key();
+  std::string id_main = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_MAIN);
+  std::string secret_main = testcase::g_api_key_cache.Get().GetClientSecret(
+      testcase::CLIENT_MAIN);
+  std::string id_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientID(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string secret_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string id_remoting = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_REMOTING);
+  std::string secret_remoting =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          testcase::CLIENT_REMOTING);
+
+  EXPECT_EQ("API_KEY", api_key);
+  EXPECT_EQ("ID_MAIN", id_main);
+  EXPECT_EQ("SECRET_MAIN", secret_main);
+  EXPECT_EQ("ID_CLOUD_PRINT", id_cloud_print);
+  EXPECT_EQ("SECRET_CLOUD_PRINT", secret_cloud_print);
+  EXPECT_EQ("ID_REMOTING", id_remoting);
+  EXPECT_EQ("SECRET_REMOTING", secret_remoting);
+}
+
+// Override all keys using both preprocessor defines and environment
+// variables.  The environment variables should win.
+namespace override_all_keys_env {
+
+// We start every test by creating a clean environment for the
+// preprocessor defines used in google_api_keys.cc
+#undef DUMMY_API_TOKEN
+#undef GOOGLE_API_KEY
+#undef GOOGLE_CLIENT_ID_MAIN
+#undef GOOGLE_CLIENT_SECRET_MAIN
+#undef GOOGLE_CLIENT_ID_CLOUD_PRINT
+#undef GOOGLE_CLIENT_SECRET_CLOUD_PRINT
+#undef GOOGLE_CLIENT_ID_REMOTING
+#undef GOOGLE_CLIENT_SECRET_REMOTING
+#undef GOOGLE_DEFAULT_CLIENT_ID
+#undef GOOGLE_DEFAULT_CLIENT_SECRET
+
+#define GOOGLE_API_KEY "API_KEY"
+#define GOOGLE_CLIENT_ID_MAIN "ID_MAIN"
+#define GOOGLE_CLIENT_SECRET_MAIN "SECRET_MAIN"
+#define GOOGLE_CLIENT_ID_CLOUD_PRINT "ID_CLOUD_PRINT"
+#define GOOGLE_CLIENT_SECRET_CLOUD_PRINT "SECRET_CLOUD_PRINT"
+#define GOOGLE_CLIENT_ID_REMOTING "ID_REMOTING"
+#define GOOGLE_CLIENT_SECRET_REMOTING "SECRET_REMOTING"
+
+// Undef include guard so things get defined again, within this namespace.
+#undef GOOGLE_APIS_GOOGLE_API_KEYS_H_
+#undef GOOGLE_APIS_INTERNAL_GOOGLE_CHROME_API_KEYS_
+#include "google_apis/google_api_keys.cc"
+
+}  // namespace override_all_keys_env
+
+TEST_F(GoogleAPIKeysTest, OverrideAllKeysUsingEnvironment) {
+  namespace testcase = override_all_keys_env::google_apis;
+
+  scoped_ptr<base::Environment> env(base::Environment::Create());
+  env->SetVar("GOOGLE_API_KEY", "env-API_KEY");
+  env->SetVar("GOOGLE_CLIENT_ID_MAIN", "env-ID_MAIN");
+  env->SetVar("GOOGLE_CLIENT_ID_CLOUD_PRINT", "env-ID_CLOUD_PRINT");
+  env->SetVar("GOOGLE_CLIENT_ID_REMOTING", "env-ID_REMOTING");
+  env->SetVar("GOOGLE_CLIENT_SECRET_MAIN", "env-SECRET_MAIN");
+  env->SetVar("GOOGLE_CLIENT_SECRET_CLOUD_PRINT", "env-SECRET_CLOUD_PRINT");
+  env->SetVar("GOOGLE_CLIENT_SECRET_REMOTING", "env-SECRET_REMOTING");
+
+  // It's important that the first call to Get() only happen after the
+  // environment variables have been set.
+  std::string api_key = testcase::g_api_key_cache.Get().api_key();
+  std::string id_main = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_MAIN);
+  std::string secret_main = testcase::g_api_key_cache.Get().GetClientSecret(
+      testcase::CLIENT_MAIN);
+  std::string id_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientID(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string secret_cloud_print =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          testcase::CLIENT_CLOUD_PRINT);
+  std::string id_remoting = testcase::g_api_key_cache.Get().GetClientID(
+      testcase::CLIENT_REMOTING);
+  std::string secret_remoting =
+      testcase::g_api_key_cache.Get().GetClientSecret(
+          testcase::CLIENT_REMOTING);
+
+  EXPECT_EQ("env-API_KEY", api_key);
+  EXPECT_EQ("env-ID_MAIN", id_main);
+  EXPECT_EQ("env-SECRET_MAIN", secret_main);
+  EXPECT_EQ("env-ID_CLOUD_PRINT", id_cloud_print);
+  EXPECT_EQ("env-SECRET_CLOUD_PRINT", secret_cloud_print);
+  EXPECT_EQ("env-ID_REMOTING", id_remoting);
+  EXPECT_EQ("env-SECRET_REMOTING", secret_remoting);
+}
+
+#endif  // defined(OS_LINUX) || defined(OS_MACOSX)

google_apis/google_apis.gyp

@@ -87,28 +87,5 @@
         'google_api_keys.h',
       ],
     },
-    {
-      'target_name': 'google_apis_unittests',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gmock.gyp:gmock',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'gaia/mock_url_fetcher_factory.h',
-        'gaia/gaia_auth_fetcher_unittest.cc',
-        'gaia/gaia_auth_util_unittest.cc',
-        'gaia/gaia_authenticator_unittest.cc',
-        'gaia/gaia_oauth_client_unittest.cc',
-        'gaia/google_service_auth_error_unittest.cc',
-        'gaia/oauth_request_signer_unittest.cc',
-        'gaia/oauth2_access_token_fetcher_unittest.cc',
-        'gaia/oauth2_api_call_flow_unittest.cc',
-        'gaia/oauth2_mint_token_fetcher_unittest.cc',
-        'gaia/oauth2_mint_token_flow_unittest.cc',
-        'gaia/oauth2_revocation_fetcher_unittest.cc',
-      ],
-    },
   ],
 }