Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1381)

Unified Diff: net/http/http_auth_handler_basic_unittest.cc

Issue 3040016: Net: Convert username and password to string16. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: address comments Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_auth_handler_basic.cc ('k') | net/http/http_auth_handler_digest.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_auth_handler_basic_unittest.cc
===================================================================
--- net/http/http_auth_handler_basic_unittest.cc (revision 53997)
+++ net/http/http_auth_handler_basic_unittest.cc (working copy)
@@ -2,28 +2,30 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "testing/gtest/include/gtest/gtest.h"
+#include <string>
#include "base/basictypes.h"
+#include "base/string_util.h"
#include "net/base/net_errors.h"
#include "net/http/http_auth_handler_basic.h"
#include "net/http/http_request_info.h"
+#include "testing/gtest/include/gtest/gtest.h"
namespace net {
TEST(HttpAuthHandlerBasicTest, GenerateAuthToken) {
static const struct {
- const wchar_t* username;
- const wchar_t* password;
+ const char* username;
+ const char* password;
const char* expected_credentials;
} tests[] = {
- { L"foo", L"bar", "Basic Zm9vOmJhcg==" },
+ { "foo", "bar", "Basic Zm9vOmJhcg==" },
// Empty username
- { L"", L"foobar", "Basic OmZvb2Jhcg==" },
+ { "", "foobar", "Basic OmZvb2Jhcg==" },
// Empty password
- { L"anon", L"", "Basic YW5vbjo=" },
+ { "anon", "", "Basic YW5vbjo=" },
// Empty username and empty password.
- { L"", L"", "Basic Og==" },
+ { "", "", "Basic Og==" },
};
GURL origin("http://www.example.com");
HttpAuthHandlerBasic::Factory factory;
@@ -32,8 +34,8 @@
scoped_ptr<HttpAuthHandler> basic;
EXPECT_EQ(OK, factory.CreateAuthHandlerFromString(
challenge, HttpAuth::AUTH_SERVER, origin, BoundNetLog(), &basic));
- std::wstring username(tests[i].username);
- std::wstring password(tests[i].password);
+ string16 username(ASCIIToUTF16(tests[i].username));
+ string16 password(ASCIIToUTF16(tests[i].password));
HttpRequestInfo request_info;
std::string auth_token;
int rv = basic->GenerateAuthToken(&username, &password, &request_info,
@@ -77,4 +79,4 @@
}
}
-} // namespace net
+} // namespace net
« no previous file with comments | « net/http/http_auth_handler_basic.cc ('k') | net/http/http_auth_handler_digest.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698