Net: Convert username and password to string16.

net/socket/socket_test_util.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_SOCKET_SOCKET_TEST_UTIL_H_
 #define NET_SOCKET_SOCKET_TEST_UTIL_H_
 #pragma once
 
 #include <cstring>
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_vector.h"
+#include "base/string16.h"
 #include "net/base/address_list.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "net/base/ssl_config_service.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_auth_controller.h"
 #include "net/http/http_proxy_client_socket_pool.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
@@ skipping 600 matching lines @@
 
     DISALLOW_COPY_AND_ASSIGN(MockConnectJob);
   };
 
   MockTCPClientSocketPool(
       int max_sockets,
       int max_sockets_per_group,
       const scoped_refptr<ClientSocketPoolHistograms>& histograms,
       ClientSocketFactory* socket_factory);
 
-  int release_count() const { return release_count_; };
-  int cancel_count() const { return cancel_count_; };
+  int release_count() const { return release_count_; }
+  int cancel_count() const { return cancel_count_; }
 
   // TCPClientSocketPool methods.
   virtual int RequestSocket(const std::string& group_name,
                             const void* socket_params,
                             RequestPriority priority,
                             ClientSocketHandle* handle,
                             CompletionCallback* callback,
                             const BoundNetLog& net_log);
 
   virtual void CancelRequest(const std::string& group_name,
@@ skipping 37 matching lines @@
  protected:
   virtual ~MockSOCKSClientSocketPool();
 
  private:
   const scoped_refptr<TCPClientSocketPool> tcp_pool_;
 
   DISALLOW_COPY_AND_ASSIGN(MockSOCKSClientSocketPool);
 };
 
 struct MockHttpAuthControllerData {
-  MockHttpAuthControllerData(std::string header) : auth_header(header) {}
+  explicit MockHttpAuthControllerData(std::string header)
+      : auth_header(header) {}
 
   std::string auth_header;
 };
 
 class MockHttpAuthController : public HttpAuthController {
  public:
   MockHttpAuthController();
   void SetMockAuthControllerData(struct MockHttpAuthControllerData* data,
                                  size_t data_length);
 
   // HttpAuthController methods.
   virtual int MaybeGenerateAuthToken(const HttpRequestInfo* request,
                                      CompletionCallback* callback,
                                      const BoundNetLog& net_log);
   virtual void AddAuthorizationHeader(
       HttpRequestHeaders* authorization_headers);
   virtual int HandleAuthChallenge(scoped_refptr<HttpResponseHeaders> headers,
                                   bool do_not_send_server_auth,
                                   bool establishing_tunnel,
                                   const BoundNetLog& net_log);
-  virtual void ResetAuth(const std::wstring& username,
-                         const std::wstring& password);
+  virtual void ResetAuth(const string16& username,
+                         const string16& password);
   virtual bool HaveAuthHandler() const;
   virtual bool HaveAuth() const;
 
  private:
   virtual ~MockHttpAuthController() {}
   const struct MockHttpAuthControllerData& CurrentData() const {
     DCHECK(data_index_ < data_count_);
     return data_[data_index_];
   }
 
@@ skipping 11 matching lines @@
 
 extern const char kSOCKS5OkRequest[];
 extern const int kSOCKS5OkRequestLength;
 
 extern const char kSOCKS5OkResponse[];
 extern const int kSOCKS5OkResponseLength;
 
 }  // namespace net
 
 #endif  // NET_SOCKET_SOCKET_TEST_UTIL_H_