Require explicit selection of traits for LazyInstance

google_apis/google_api_keys.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "google_apis/google_api_keys.h"
 
 // If you add more includes to this list, you also need to add them to
 // google_api_keys_unittest.cc.
 
 #include <stddef.h>
@@ skipping 271 matching lines @@
     return key_value;
   }
 
   std::string api_key_;
   std::string api_key_non_stable_;
   std::string api_key_remoting_;
   std::string client_ids_[CLIENT_NUM_ITEMS];
   std::string client_secrets_[CLIENT_NUM_ITEMS];
 };
 
-static base::LazyInstance<APIKeyCache> g_api_key_cache =
+static base::LazyInstance<APIKeyCache>::DestructorAtExit g_api_key_cache =
     LAZY_INSTANCE_INITIALIZER;
 
 bool HasKeysConfigured() {
   if (GetAPIKey() == DUMMY_API_TOKEN)
     return false;
 
   for (size_t client_id = 0; client_id < CLIENT_NUM_ITEMS; ++client_id) {
     OAuth2Client client = static_cast<OAuth2Client>(client_id);
     if (GetOAuth2ClientID(client) == DUMMY_API_TOKEN ||
         GetOAuth2ClientSecret(client) == DUMMY_API_TOKEN) {
@@ skipping 30 matching lines @@
 
 bool IsGoogleChromeAPIKeyUsed() {
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS)
   return true;
 #else
   return false;
 #endif
 }
 
 }  // namespace google_apis