Net: Convert username and password to string16.

net/http/http_cache_transaction.h

-// Copyright (c) 2006-2010 The Chromium Authors. All rights reserved.
+// 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.
 
 // This file declares HttpCache::Transaction, a private class of HttpCache so
 // it should only be included by http_cache.cc
 
 #ifndef NET_HTTP_HTTP_CACHE_TRANSACTION_H_
 #define NET_HTTP_HTTP_CACHE_TRANSACTION_H_
 #pragma once
 
+#include <string>
+
+#include "base/string16.h"
+#include "base/time.h"
 #include "net/base/net_log.h"
-#include "base/time.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_transaction.h"
 
 namespace net {
 
 class HttpResponseHeaders;
 class PartialData;
 
 // This is the transaction that is returned by the HttpCache transaction
 // factory.
 class HttpCache::Transaction : public HttpTransaction {
  public:
   Transaction(HttpCache* cache, bool enable_range_support);
   virtual ~Transaction();
 
   // HttpTransaction methods:
   virtual int Start(const HttpRequestInfo*, CompletionCallback*,
                     const BoundNetLog&);
   virtual int RestartIgnoringLastError(CompletionCallback* callback);
   virtual int RestartWithCertificate(X509Certificate* client_cert,
                                      CompletionCallback* callback);
-  virtual int RestartWithAuth(const std::wstring& username,
-                              const std::wstring& password,
+  virtual int RestartWithAuth(const string16& username,
+                              const string16& password,
                               CompletionCallback* callback);
   virtual bool IsReadyToRestartForAuth();
   virtual int Read(IOBuffer* buf, int buf_len, CompletionCallback* callback);
   virtual void StopCaching();
   virtual const HttpResponseInfo* GetResponseInfo() const;
   virtual LoadState GetLoadState() const;
   virtual uint64 GetUploadProgress(void) const;
 
   // The transaction has the following modes, which apply to how it may access
   // its cache entry.
@@ skipping 195 matching lines @@
   // Called to restart a network transaction after an error.  Returns network
   // error code.
   int RestartNetworkRequest();
 
   // Called to restart a network transaction with a client certificate.
   // Returns network error code.
   int RestartNetworkRequestWithCertificate(X509Certificate* client_cert);
 
   // Called to restart a network transaction with authentication credentials.
   // Returns network error code.
-  int RestartNetworkRequestWithAuth(const std::wstring& username,
-                                    const std::wstring& password);
+  int RestartNetworkRequestWithAuth(const string16& username,
+                                    const string16& password);
 
   // Called to determine if we need to validate the cache entry before using it.
   bool RequiresValidation();
 
   // Called to make the request conditional (to ask the server if the cached
   // copy is valid).  Returns true if able to make the request conditional.
   bool ConditionalizeRequest();
 
   // Makes sure that a 206 response is expected.  Returns true on success.
   // On success, |partial_content| will be set to true if we are processing a
@@ skipping 80 matching lines @@
   uint64 final_upload_progress_;
   CompletionCallbackImpl<Transaction> io_callback_;
   scoped_refptr<CancelableCompletionCallback<Transaction> > cache_callback_;
   scoped_refptr<CancelableCompletionCallback<Transaction> >
       write_headers_callback_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_CACHE_TRANSACTION_H_