Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / remoting / host / token_validator_factory_impl.cc

diff --git a/src/remoting/host/token_validator_factory_impl.cc b/src/remoting/host/token_validator_factory_impl.cc
index 0d7906a..3357558 100644 (file)
--- a/src/remoting/host/token_validator_factory_impl.cc
+++ b/src/remoting/host/token_validator_factory_impl.cc
@@ -13,11 +13,11 @@
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "crypto/random.h"
+#include "net/base/elements_upload_data_stream.h"
 #include "net/base/escape.h"
 #include "net/base/io_buffer.h"
 #include "net/base/request_priority.h"
 #include "net/base/upload_bytes_element_reader.h"
-#include "net/base/upload_data_stream.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
@@ -45,7 +45,7 @@ class TokenValidatorImpl : public TokenValidatorBase {
       scoped_refptr<net::URLRequestContextGetter> request_context_getter);
 
  protected:
-  virtual void StartValidateRequest(const std::string& token) OVERRIDE;
+  void StartValidateRequest(const std::string& token) override;
 
  private:
   static std::string CreateScope(const std::string& local_jid,
@@ -90,8 +90,8 @@ void TokenValidatorImpl::StartValidateRequest(const std::string& token) {
   scoped_ptr<net::UploadElementReader> reader(
       new net::UploadBytesElementReader(
           post_body_.data(), post_body_.size()));
-  request_->set_upload(make_scoped_ptr(
-      net::UploadDataStream::CreateWithReader(reader.Pass(), 0)));
+  request_->set_upload(
+      net::ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0));
   request_->Start();
 }
 
@@ -121,7 +121,7 @@ scoped_ptr<protocol::TokenValidator>
 TokenValidatorFactoryImpl::CreateTokenValidator(
     const std::string& local_jid,
     const std::string& remote_jid) {
-  return scoped_ptr<protocol::TokenValidator>(
+  return make_scoped_ptr(
       new TokenValidatorImpl(third_party_auth_config_,
                              key_pair_, local_jid, remote_jid,
                              request_context_getter_));