Cleaning up TODOs in //google_apis.

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 "base/command_line.h"
 #include "base/environment.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringize_macros.h"
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS)
 #include "google_apis/internal/google_chrome_api_keys.h"
 #endif
 
-// TODO(joi): Can we enable this warning without having it treated as
-// an error? We don't want to fail builds, just warn, but all warnings
-// from the preprocessor are currently treated as errors, at least in
-// Linux builds.
-#if 0
-#if !defined(GOOGLE_API_KEY) && (                      \
-  (!defined(GOOGLE_DEFAULT_CLIENT_ID) &&               \
-   !defined(GOOGLE_DEFAULT_CLIENT_SECRET))             \
-  ||                                                   \
-  (!defined(GOOGLE_CLIENT_ID_MAIN) &&                  \
-   !defined(GOOGLE_CLIENT_SECRET_MAIN)))
-#warning You have not specified API keys; some features may not work.
-#warning See www.chromium.org/developers/how-tos/api-keys for details.
-#endif  // (API keys unset)
-#endif  // 0
-
 // Used to indicate an unset key/id/secret.  This works better with
 // various unit tests than leaving the token empty.
 #define DUMMY_API_TOKEN "dummytoken"
 
 #if !defined(GOOGLE_API_KEY)
 #define GOOGLE_API_KEY DUMMY_API_TOKEN
 #endif
 
 #if !defined(GOOGLE_CLIENT_ID_MAIN)
 #define GOOGLE_CLIENT_ID_MAIN DUMMY_API_TOKEN
@@ skipping 210 matching lines @@
 
 std::string GetOAuth2ClientID(OAuth2Client client) {
   return g_api_key_cache.Get().GetClientID(client);
 }
 
 std::string GetOAuth2ClientSecret(OAuth2Client client) {
   return g_api_key_cache.Get().GetClientSecret(client);
 }
 
 }  // namespace google_apis