Request the Identity API's Uber Token without a Channel ID

chrome/browser/extensions/api/identity/gaia_web_auth_flow.h

Index: chrome/browser/extensions/api/identity/gaia_web_auth_flow.h
diff --git a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h
index 7cb132a5c4e36ffc28f823d811c55074f1a55c60..d91dda002cb5113cc4e708fa068cae22e96d5ab8 100644
--- a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h
+++ b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.h
@@ -8,9 +8,14 @@
 #include "base/macros.h"
 #include "chrome/browser/extensions/api/identity/extension_token_key.h"
 #include "chrome/browser/extensions/api/identity/web_auth_flow.h"
+#include "chrome/browser/profiles/profile_io_data.h"
 #include "extensions/common/manifest_handlers/oauth2_manifest_handler.h"
 #include "google_apis/gaia/ubertoken_fetcher.h"
 
+namespace net {
+class TrivialURLRequestContextGetter;
+}
+
 namespace extensions {
 
 // Implements a web-based OAuth2 scope approval dialog. This flow has
@@ -83,6 +88,10 @@ class GaiaWebAuthFlow : public UbertokenConsumer, public WebAuthFlow::Delegate {
   // for testing. Used to kick off the MergeSession (step #2).
   virtual std::unique_ptr<WebAuthFlow> CreateWebAuthFlow(GURL url);
 
+  void StartOnIOThread();
+  void StartUberTokenFetch();
+  void CleanupRequestContextOnIOThread();
+
   Delegate* delegate_;
   Profile* profile_;
   std::string account_id_;
@@ -91,6 +100,9 @@ class GaiaWebAuthFlow : public UbertokenConsumer, public WebAuthFlow::Delegate {
   GURL auth_url_;
   std::unique_ptr<UbertokenFetcher> ubertoken_fetcher_;
   std::unique_ptr<WebAuthFlow> web_flow_;
+  std::unique_ptr<net::URLRequestContext> ubertoken_request_context_;
+  scoped_refptr<net::TrivialURLRequestContextGetter> context_getter_;
+  net::URLRequestContextGetter* main_context_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaWebAuthFlow);
 };