From 13c8a0903376ff406151679d8673a6452d721290 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Thu, 29 Jul 2010 06:15:44 +0000 Subject: Net: Convert username and password to string16. BUG=none TEST=none Review URL: http://codereview.chromium.org/3040016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54101 0039d316-1c4b-4281-b951-d872f2087c98 --- net/http/http_auth_handler_negotiate_unittest.cc | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'net/http/http_auth_handler_negotiate_unittest.cc') diff --git a/net/http/http_auth_handler_negotiate_unittest.cc b/net/http/http_auth_handler_negotiate_unittest.cc index 4fcdad1..75063ca 100644 --- a/net/http/http_auth_handler_negotiate_unittest.cc +++ b/net/http/http_auth_handler_negotiate_unittest.cc @@ -4,6 +4,7 @@ #include "net/http/http_auth_handler_negotiate.h" +#include "base/string_util.h" #include "net/base/mock_host_resolver.h" #include "net/base/net_errors.h" #include "net/base/test_completion_callback.h" @@ -225,8 +226,8 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCname) { TestCompletionCallback callback; HttpRequestInfo request_info; std::string token; - std::wstring username = L"foo"; - std::wstring password = L"bar"; + string16 username = ASCIIToUTF16("foo"); + string16 password = ASCIIToUTF16("bar"); EXPECT_EQ(OK, auth_handler->GenerateAuthToken(&username, &password, &request_info, &callback, &token)); @@ -246,8 +247,8 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameStandardPort) { TestCompletionCallback callback; HttpRequestInfo request_info; std::string token; - std::wstring username = L"foo"; - std::wstring password = L"bar"; + string16 username = ASCIIToUTF16("foo"); + string16 password = ASCIIToUTF16("bar"); EXPECT_EQ(OK, auth_handler->GenerateAuthToken(&username, &password, &request_info, &callback, &token)); @@ -267,8 +268,8 @@ TEST_F(HttpAuthHandlerNegotiateTest, DisableCnameNonstandardPort) { TestCompletionCallback callback; HttpRequestInfo request_info; std::string token; - std::wstring username = L"foo"; - std::wstring password = L"bar"; + string16 username = ASCIIToUTF16("foo"); + string16 password = ASCIIToUTF16("bar"); EXPECT_EQ(OK, auth_handler->GenerateAuthToken(&username, &password, &request_info, &callback, &token)); @@ -288,8 +289,8 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameSync) { TestCompletionCallback callback; HttpRequestInfo request_info; std::string token; - std::wstring username = L"foo"; - std::wstring password = L"bar"; + string16 username = ASCIIToUTF16("foo"); + string16 password = ASCIIToUTF16("bar"); EXPECT_EQ(OK, auth_handler->GenerateAuthToken(&username, &password, &request_info, &callback, &token)); @@ -309,8 +310,8 @@ TEST_F(HttpAuthHandlerNegotiateTest, CnameAsync) { TestCompletionCallback callback; HttpRequestInfo request_info; std::string token; - std::wstring username = L"foo"; - std::wstring password = L"bar"; + string16 username = ASCIIToUTF16("foo"); + string16 password = ASCIIToUTF16("bar"); EXPECT_EQ(ERR_IO_PENDING, auth_handler->GenerateAuthToken( &username, &password, &request_info, &callback, &token)); EXPECT_EQ(OK, callback.WaitForResult()); -- cgit v1.1