Moved data reduction proxy initialization logic to ProfileImplIOData

components/data_reduction_proxy/browser/data_reduction_proxy_auth_request_handler.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_
 #define COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "url/gurl.h"
 
+namespace base {
+class MessageLoopProxy;
+}
+
 namespace net {
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class ProxyServer;
 class URLRequest;
 }
 
 namespace data_reduction_proxy {
 
 extern const char kProtocolVersion[];
 
 extern const char kClientAndroidWebview[];
 extern const char kClientChromeAndroid[];
 extern const char kClientChromeIOS[];
 
 class DataReductionProxyParams;
 
 class DataReductionProxyAuthRequestHandler {
  public:
   static bool IsKeySetOnCommandLine();
 
   // Constructs an authentication request handler.
   explicit DataReductionProxyAuthRequestHandler(
-      DataReductionProxyParams* params);
+      DataReductionProxyParams* params,
+      base::MessageLoopProxy* io_thread_proxy);

[willchan no longer on Chromium, 2014/07/31 22:31:35]

Please use SingleThreadTaskRunner instead. MLP is deprecated.

[bengr, 2014/08/02 01:10:32]

Done.

 
   virtual ~DataReductionProxyAuthRequestHandler();
 
   // Adds a 'Chrome-Proxy' header to |request_headers| with the data reduction
   // proxy authentication credentials. Only adds this header if the provided
-  // |proxy_server| is a data reduction proxy.
+  // |proxy_server| is a data reduction proxy. Must be called on the IO thread.
   void MaybeAddRequestHeader(net::URLRequest* request,
                              const net::ProxyServer& proxy_server,
                              net::HttpRequestHeaders* request_headers);
 
   // Sets a new authentication key. This must be called for platforms that do
   // not have a default key defined. See the constructor implementation for
   // those platforms. Client is the canonical name for the client. Client names
   // should be defined in this file as one of |kClient...|. Version is the
   // authentication protocol version that the client uses, which should be
   // |kProtocolVersion| unless the client expects to be handled differently from
-  // the standard behavior.
+  // the standard behavior. Must be called on the UI Thread.

[willchan no longer on Chromium, 2014/07/31 22:31:35]

Since this object primarily lives on the IO thread, please name this function
SetKeyOnUI(). And add OnUI() for all member functions that are supposed to be on
the UI thread.

[bengr, 2014/08/02 01:10:32]

Done.

   void SetKey(const std::string& key,
               const std::string& client,
               const std::string& version);
 
  protected:
   void Init();
-  void InitAuthentication(const std::string& key);
+  void InitAuthentication(const std::string& key,
+                          const std::string& client,
+                          const std::string& version);
 
   void AddAuthorizationHeader(net::HttpRequestHeaders* headers);
 
   // Returns a UTF16 string that's the hash of the configured authentication
   // |key| and |salt|. Returns an empty UTF16 string if no key is configured or
   // the data reduction proxy feature isn't available.
   static base::string16 AuthHashForSalt(int64 salt,
                                         const std::string& key);
   // Visible for testing.
   virtual base::Time Now() const;
   virtual void RandBytes(void* output, size_t length);
 
   // Visible for testing.
   virtual std::string GetDefaultKey() const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxyAuthRequestHandlerTest,
                            Authorization);
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxyAuthRequestHandlerTest,
                            AuthHashForSalt);
 
+  void InitAuthenticationOnIOThread(

[marq (ping after 24h), 2014/07/31 23:54:32]

Symmetrically with Will's comments, if this is primary an IO-thread-dwelling
object, OnIO(Thread) can be assumed on any method that doesn't say otherwise, so
this can just be InitAuthentication().

[bengr, 2014/08/02 01:10:32]

Done.

+      const std::string& session,
+      const std::string& credentials,
+      const std::string& client,
+      const std::string& version);
+
   // Authentication state.
   std::string key_;
+
+  // Lives on the IO thread.
   std::string session_;
   std::string credentials_;
 
   // Name of the client and version of the data reduction proxy protocol to use.
+  // Both live on the IO thread.
   std::string client_;
   std::string version_;
 
   DataReductionProxyParams* data_reduction_proxy_params_;
 
+  base::MessageLoopProxy* io_thread_proxy_;
+
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxyAuthRequestHandler);
 };
 
 }  // namespace data_reduction_proxy
 #endif  // COMPONENTS_DATA_REDUCTION_PROXY_BROWSER_DATA_REDUCTION_PROXY_AUTH_REQUEST_HANDLER_H_