Net: Convert username and password to string16.

net/ftp/ftp_network_transaction.h

 // Copyright (c) 2010 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 NET_FTP_FTP_NETWORK_TRANSACTION_H_
 #define NET_FTP_FTP_NETWORK_TRANSACTION_H_
 #pragma once
 
+#include <queue>
 #include <string>
-#include <queue>
 #include <utility>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "base/string16.h"
 #include "net/base/address_list.h"
 #include "net/base/host_resolver.h"
 #include "net/base/net_log.h"
 #include "net/ftp/ftp_ctrl_response_buffer.h"
 #include "net/ftp/ftp_response_info.h"
 #include "net/ftp/ftp_transaction.h"
 
 namespace net {
 
 class ClientSocket;
 class ClientSocketFactory;
 class FtpNetworkSession;
 
 class FtpNetworkTransaction : public FtpTransaction {
  public:
   FtpNetworkTransaction(FtpNetworkSession* session,
                         ClientSocketFactory* socket_factory);
   virtual ~FtpNetworkTransaction();
 
   // FtpTransaction methods:
   virtual int Start(const FtpRequestInfo* request_info,
                     CompletionCallback* callback,
                     const BoundNetLog& net_log);
   virtual int Stop(int error);
-  virtual int RestartWithAuth(const std::wstring& username,
-                              const std::wstring& password,
+  virtual int RestartWithAuth(const string16& username,
+                              const string16& password,
                               CompletionCallback* callback);
   virtual int RestartIgnoringLastError(CompletionCallback* callback);
   virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback);
   virtual const FtpResponseInfo* GetResponseInfo() const;
   virtual LoadState GetLoadState() const;
   virtual uint64 GetUploadProgress() const;
 
  private:
   enum Command {
     COMMAND_NONE,
@@ skipping 142 matching lines @@
   // Data type to be used for the TYPE command.
   DataType data_type_;
 
   // Detected resource type (file or directory).
   ResourceType resource_type_;
 
   // Initially we favour EPSV over PASV for transfers but should any
   // EPSV fail, we fall back to PASV for the duration of connection.
   bool use_epsv_;
 
-  // We get username and password as wstrings in RestartWithAuth, so they are
-  // also kept as wstrings here.
-  std::wstring username_;
-  std::wstring password_;
+  string16 username_;
+  string16 password_;
 
   // Current directory on the remote server, as returned by last PWD command,
   // with any trailing slash removed.
   std::string current_remote_directory_;
 
   int data_connection_port_;
 
   ClientSocketFactory* socket_factory_;
 
   scoped_ptr<ClientSocket> ctrl_socket_;
@@ skipping 28 matching lines @@
     STATE_DATA_READ,
     STATE_DATA_READ_COMPLETE,
     STATE_NONE
   };
   State next_state_;
 };
 
 }  // namespace net
 
 #endif  // NET_FTP_FTP_NETWORK_TRANSACTION_H_