Refactor TokenValidatorImpl into a base class + implementation.

remoting/host/token_validator_base.h

Index: remoting/host/token_validator_base.h
diff --git a/remoting/host/token_validator_base.h b/remoting/host/token_validator_base.h
new file mode 100644
index 0000000000000000000000000000000000000000..7c5cbfd83bc2f8900688f9e2d7469ca07100ebc1
--- /dev/null
+++ b/remoting/host/token_validator_base.h
@@ -0,0 +1,90 @@
+// 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 REMOTING_HOST_TOKEN_VALIDATOR_BASE_H_
+#define REMOTING_HOST_TOKEN_VALIDATOR_BASE_H_
+
+#include "base/callback.h"
+#include "base/memory/weak_ptr.h"
+#include "net/url_request/url_request.h"
+#include "net/url_request/url_request_context_getter.h"
+#include "remoting/protocol/third_party_host_authenticator.h"
+#include "url/gurl.h"
+
+namespace net {
+class ClientCertStore;
+typedef std::vector<scoped_refptr<X509Certificate> > CertificateList;
+}
+
+namespace remoting {
+
+struct ThirdPartyAuthConfig {
+  inline bool is_empty() const {
+    return token_url.is_empty() && token_validation_url.is_empty();
+  }
+
+  inline bool is_valid() const {
+    return token_url.is_valid() && token_validation_url.is_valid();
+  }
+
+  GURL token_url;
+  GURL token_validation_url;
+  std::string token_validation_cert_issuer;
+};
+
+class TokenValidatorBase
+    : public net::URLRequest::Delegate,
+      public protocol::ThirdPartyHostAuthenticator::TokenValidator {

[Sergey Ulanov, 2014/02/18 07:10:04]

Maybe pull TokenValidator out of ThirdPartyHostAuthenticator? 
Given that TokenValidatorBase is in remoting namespace it makes sense to move
TokenValidator there as well.

[rmsousa, 2014/02/19 02:29:42]

Done.

+ public:
+  TokenValidatorBase(
+      const ThirdPartyAuthConfig& third_party_auth_config,
+      const std::string& token_scope,
+      scoped_refptr<net::URLRequestContextGetter> request_context_getter);
+  virtual ~TokenValidatorBase();
+
+  // TokenValidator interface.
+  virtual void ValidateThirdPartyToken(
+      const std::string& token,
+      const base::Callback<void(
+          const std::string& shared_secret)>& on_token_validated) OVERRIDE;
+
+  virtual const GURL& token_url() const OVERRIDE;
+  virtual const std::string& token_scope() const OVERRIDE;
+
+  // URLRequest::Delegate interface.
+  virtual void OnResponseStarted(net::URLRequest* source) OVERRIDE;
+  virtual void OnReadCompleted(net::URLRequest* source,
+                               int bytes_read) OVERRIDE;
+  virtual void OnCertificateRequested(
+      net::URLRequest* source,
+      net::SSLCertRequestInfo* cert_request_info) OVERRIDE;
+
+ protected:
+  void OnCertificatesSelected(net::CertificateList* selected_certs,
+                              net::ClientCertStore* unused);
+
+  virtual void StartValidateRequest(const std::string& token) = 0;
+  virtual bool IsValidScope(const std::string& token_scope);
+  std::string ProcessResponse();
+
+  // Constructor parameters.
+  ThirdPartyAuthConfig third_party_auth_config_;
+  std::string token_scope_;
+  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
+
+  // URLRequest related fields.
+  scoped_ptr<net::URLRequest> request_;
+  scoped_refptr<net::IOBuffer> buffer_;
+  std::string data_;
+
+  base::Callback<void(const std::string& shared_secret)> on_token_validated_;
+
+  base::WeakPtrFactory<TokenValidatorBase> weak_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(TokenValidatorBase);
+};
+
+}  // namespace remoting
+
+#endif  // REMOTING_HOST_TOKEN_VALIDATOR_BASE_H