Move OAuth2 client id and secret switches to gaia_switches.h

google_apis/google_api_keys.cc

Index: google_apis/google_api_keys.cc
diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc
index 2cf92fd0bf9ea623ff4f3e4e66c2a2c2dcafa032..f879979bc78a49baafabf0ac192f96bb68c95ea0 100644
--- a/google_apis/google_api_keys.cc
+++ b/google_apis/google_api_keys.cc
@@ -12,6 +12,7 @@
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/stringize_macros.h"
+#include "google_apis/gaia/gaia_switches.h"
 
 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_OFFICIAL_GOOGLE_API_KEYS)
 #include "google_apis/internal/google_chrome_api_keys.h"
@@ -69,16 +70,6 @@
 #define GOOGLE_DEFAULT_CLIENT_SECRET ""
 #endif
 
-namespace switches {
-
-// Specifies custom OAuth2 client id for testing purposes.
-const char kOAuth2ClientID[] = "oauth2-client-id";
-
-// Specifies custom OAuth2 client secret for testing purposes.
-const char kOAuth2ClientSecret[] = "oauth2-client-secret";
-
-}  // namespace switches
-
 namespace google_apis {
 
 // This is used as a lazy instance to determine keys once and cache them.