commit 0b1b1a5999fd52fb85face2be75e5037355a689e
author Julien Boeuf <jboeuf@google.com> Fri Jul 10 08:35:04 2015 -0700
committer Julien Boeuf <jboeuf@google.com> Fri Jul 10 08:35:04 2015 -0700
tree 82ac8317433cffd95afe437270482878812a951b
parent b037bb648884c01a12d272d9b4e528d304a4213d
parent b652fc0d172e0eb1023282fa6ee24eb41cbbea85

Merge branch 'master' of github.com:grpc/grpc into flexible_default_creds

src/core/security/credentials.h

diff --git a/src/core/security/credentials.h b/src/core/security/credentials.h
index 93b141f..d988901 100644
--- a/src/core/security/credentials.h
+++ b/src/core/security/credentials.h
@@ -262,7 +262,6 @@
   grpc_credentials_md_store *access_token_md;
   gpr_timespec token_expiration;
   grpc_httpcli_context httpcli_context;
-  grpc_pollset_set pollset_set;
   grpc_fetch_oauth2_func fetch_func;
 } grpc_oauth2_token_fetcher_credentials;
 
@@ -282,6 +281,13 @@
   grpc_auth_refresh_token refresh_token;
 } grpc_refresh_token_credentials;
 
+/* -- Oauth2 Access Token credentials. -- */
+
+typedef struct {
+  grpc_credentials base;
+  grpc_credentials_md_store *access_token_md;
+} grpc_access_token_credentials;
+
 /* -- Fake Oauth2 credentials. -- */
 
 typedef struct {