Adjust callers and networking delegates in remoting/ to modified APIs

remoting/host/token_validator_base.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 REMOTING_HOST_TOKEN_VALIDATOR_BASE_H_
 #define REMOTING_HOST_TOKEN_VALIDATOR_BASE_H_
 
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 25 matching lines @@
   // TokenValidator interface.
   void ValidateThirdPartyToken(
       const std::string& token,
       const base::Callback<void(const std::string& shared_secret)>&
           on_token_validated) override;
 
   const GURL& token_url() const override;
   const std::string& token_scope() const override;
 
   // URLRequest::Delegate interface.
-  void OnResponseStarted(net::URLRequest* source) override;
+  void OnResponseStarted(net::URLRequest* source, int net_error) override;
   void OnReadCompleted(net::URLRequest* source, int bytes_read) override;
   void OnReceivedRedirect(net::URLRequest* request,
                           const net::RedirectInfo& redirect_info,
                           bool* defer_redirect) override;
   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();
+  std::string ProcessResponse(int net_error);
 
   // Constructor parameters.
   ThirdPartyAuthConfig third_party_auth_config_;
   std::string token_scope_;
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   // URLRequest related fields.
   std::unique_ptr<net::URLRequest> request_;
   scoped_refptr<net::IOBuffer> buffer_;
   std::string data_;
@@ skipping 13 matching lines @@
   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