Removed unnecessary refreshTrustBoundaryAndGetAdditionalHeaders as tb refresh now happens within access token refresh of individual classes.

Author: vverman

oauth2_http/java/com/google/auth/oauth2/GoogleCredentials.java

@@ -346,19 +346,11 @@ protected void refreshTrustBoundaries(AccessToken newAccessToken) throws IOExcep
 
  @Override
   protected Map<String, List<String>> getAdditionalHeaders() {
-    Map<String, List<String>> headers = super.getAdditionalHeaders();
+    Map<String, List<String>> headers = new HashMap<>(super.getAdditionalHeaders());
     String quotaProjectId = this.getQuotaProjectId();
     if (quotaProjectId != null) {
-      return addQuotaProjectIdToRequestMetadata(quotaProjectId, headers);
+      headers.put(QUOTA_PROJECT_ID_HEADER_KEY, Collections.singletonList(quotaProjectId));
     }
-    return headers;
-  }
-
-@Override
-  protected Map<String, List<String>> refreshTrustBoundaryAndGetAdditionalHeaders(AccessToken newAccessToken) throws IOException{
-    Map<String, List<String>> headers = new HashMap<>(getAdditionalHeaders());
-
-    refreshTrustBoundaries(newAccessToken);
 
     if (this.trustBoundary != null) {
       String headerValue = trustBoundary.isNoOp() ? "" : trustBoundary.getEncodedLocations();

oauth2_http/java/com/google/auth/oauth2/OAuth2Credentials.java

@@ -266,14 +266,7 @@ private AsyncRefreshResult getOrCreateRefreshTask() {
       final ListenableFutureTask<OAuthValue> task =
           ListenableFutureTask.create(
               () -> {
-                AccessToken newAccessToken = refreshAccessToken();
-                Map<String, List<String>> newHeaders;
-                if(this instanceof TrustBoundaryProvider) {
-                  newHeaders = refreshTrustBoundaryAndGetAdditionalHeaders(newAccessToken);
-                } else{
-                  newHeaders = getAdditionalHeaders();
-                }
-                return OAuthValue.create(newAccessToken, newHeaders);
+                return OAuthValue.create(refreshAccessToken(), getAdditionalHeaders());
               });
 
       refreshTask = new RefreshTask(task, new RefreshTaskListener(task));
@@ -384,16 +377,6 @@ protected Map<String, List<String>> getAdditionalHeaders() {
     return EMPTY_EXTRA_HEADERS;
   }
 
-  /**
-   * Refresh trust boundary and get additional headers to return as request metadata.
-   *
-   * @return additional headers.
-   */
-  protected Map<String, List<String>> refreshTrustBoundaryAndGetAdditionalHeaders(AccessToken newAccessToken) throws IOException {
-    return EMPTY_EXTRA_HEADERS;
-  }
-
-
   /**
    * Adds a listener that is notified when the Credentials data changes.
    *