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

chrome/browser/profiles/profile_io_data.h

Index: chrome/browser/profiles/profile_io_data.h
diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
index f373eaa0acd0d871917a087d077e67e6676fa8e5..ad287968e92e10289468b10f870d6e953740d81c 100644
--- a/chrome/browser/profiles/profile_io_data.h
+++ b/chrome/browser/profiles/profile_io_data.h
@@ -265,22 +265,6 @@ class ProfileIOData {
   // Get platform ClientCertStore. May return nullptr.
   std::unique_ptr<net::ClientCertStore> CreateClientCertStore();
 
- protected:
-  // A URLRequestContext for media that owns its HTTP factory, to ensure
-  // it is deleted.
-  class MediaRequestContext : public net::URLRequestContext {
-   public:
-    MediaRequestContext();
-
-    void SetHttpTransactionFactory(
-        std::unique_ptr<net::HttpTransactionFactory> http_factory);
-
-   private:
-    ~MediaRequestContext() override;
-
-    std::unique_ptr<net::HttpTransactionFactory> http_factory_;
-  };
-
   // A URLRequestContext for apps that owns its cookie store and HTTP factory,
   // to ensure they are deleted.
   class AppRequestContext : public net::URLRequestContext {
@@ -306,6 +290,22 @@ class ProfileIOData {
     std::unique_ptr<net::URLRequestJobFactory> job_factory_;
   };
 
+ protected:

[anthonyvd, 2016/07/13 18:36:08]

This diff is pretty bad. This is making AppRequestContext public.

[nharper, 2016/07/13 20:04:47]

The reason for using the AppRequestContext was to have something to hold
ownership of the URLRequestContext's pointers. I think you could use an
URLRequestContext directly and have the GaiaWebAuthFlow hold ownership (or use
an URLRequestContextStorage to hold ownership of the new objects).

[anthonyvd, 2016/07/13 20:33:46]

I see. I initially tried to use it because it's not possible to set
HttpNetworkSession on net::URLRequestContext. Turns out it's
HttpTransactionFactory that ties all of this together so using AppRequestContext
was irrelevant.

Done.

+  // A URLRequestContext for media that owns its HTTP factory, to ensure
+  // it is deleted.
+  class MediaRequestContext : public net::URLRequestContext {
+   public:
+    MediaRequestContext();
+
+    void SetHttpTransactionFactory(
+        std::unique_ptr<net::HttpTransactionFactory> http_factory);
+
+   private:
+    ~MediaRequestContext() override;
+
+    std::unique_ptr<net::HttpTransactionFactory> http_factory_;
+  };
+
   // Created on the UI thread, read on the IO thread during ProfileIOData lazy
   // initialization.
   struct ProfileParams {