| Index: google_apis/google_api_keys_unittest.cc
|
| diff --git a/google_apis/google_api_keys_unittest.cc b/google_apis/google_api_keys_unittest.cc
|
| index 74765ecaefe2747c79eed074233c5a8b0403d93c..1b0515ffa6949bf6f3c50d1962c1eeeb447246b7 100644
|
| --- a/google_apis/google_api_keys_unittest.cc
|
| +++ b/google_apis/google_api_keys_unittest.cc
|
| @@ -394,6 +394,8 @@ TEST_F(GoogleAPIKeysTest, OverrideAllKeys) {
|
| EXPECT_EQ("SECRET_REMOTING_HOST", secret_remoting_host);
|
| }
|
|
|
| +#if !defined(GOOGLE_CHROME_BUILD)
|
| +
|
| // Override all keys using both preprocessor defines and environment
|
| // variables. The environment variables should win.
|
| namespace override_all_keys_env {
|
| @@ -481,6 +483,8 @@ TEST_F(GoogleAPIKeysTest, OverrideAllKeysUsingEnvironment) {
|
| EXPECT_EQ("env-SECRET_REMOTING_HOST", secret_remoting_host);
|
| }
|
|
|
| +#endif // !defined(GOOGLE_CHROME_BUILD)
|
| +
|
| #if defined(OS_IOS)
|
| // Override all keys using both preprocessor defines and setters.
|
| // Setters should win.
|
|
|