Move OAuth2 client id and secret switches to gaia_switches.h

The OAuth2 client id and secret switches are also used on Chrome for iOS
downstream so they need to be available in a public header.

BUG=285944

Review URL: https://codereview.chromium.org/141653020

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

Author: msarda@chromium.org

google_apis/gaia/gaia_switches.cc

@@ -13,5 +13,7 @@ const char kLsoUrl[]                        = "lso-url";
 const char kOAuth1LoginScope[]              = "oauth1-login-scope";
 const char kOAuthWrapBridgeUserInfoScope[] =
     "oauth-wrap-bridge-user-info-scope";
+const char kOAuth2ClientID[] = "oauth2-client-id";
+const char kOAuth2ClientSecret[] = "oauth2-client-secret";
 
 }  // namespace switches

google_apis/gaia/gaia_switches.h

@@ -28,6 +28,12 @@ extern const char kOAuth1LoginScope[];
 // Overrides OAuth wrap bridge user info scope.
 extern const char kOAuthWrapBridgeUserInfoScope[];
 
+// Specifies custom OAuth2 client id for testing purposes.
+extern const char kOAuth2ClientID[];
+
+// Specifies custom OAuth2 client secret for testing purposes.
+extern const char kOAuth2ClientSecret[];
+
 }  // namespace switches
 
 #endif  // GOOGLE_APIS_GAIA_GAIA_SWITCHES_H_

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.

google_apis/google_api_keys_unittest.cc

@@ -13,6 +13,7 @@
 #include "google_apis/google_api_keys.h"
 
 #include "build/build_config.h"
+#include "google_apis/gaia/gaia_switches.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The Win builders fail (with a linker crash) when trying to link