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

Unified Diff: net/base/cert_database_nss_unittest.cc

Issue 8687002: Cleanup: Convert ASCIIToUTF16("") to string16(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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 | « chrome/browser/webdata/web_database_migration_unittest.cc ('k') | ui/gfx/font_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/cert_database_nss_unittest.cc
diff --git a/net/base/cert_database_nss_unittest.cc b/net/base/cert_database_nss_unittest.cc
index 1038e76402c122cd8b6fe9eb3616ad665b03af4a..1129544aad76747975f10b3dbbd63671e485d8e7 100644
--- a/net/base/cert_database_nss_unittest.cc
+++ b/net/base/cert_database_nss_unittest.cc
@@ -12,6 +12,7 @@
#include "base/lazy_instance.h"
#include "base/path_service.h"
#include "base/scoped_temp_dir.h"
+#include "base/string16.h"
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "crypto/nss_util.h"
@@ -152,7 +153,7 @@ TEST_F(CertDatabaseNSSTest, ImportFromPKCS12WrongPassword) {
EXPECT_EQ(ERR_PKCS12_IMPORT_BAD_PASSWORD,
cert_db_.ImportFromPKCS12(slot_,
pkcs12_data,
- ASCIIToUTF16(""),
+ string16(),
true)); // is_extractable
// Test db should still be empty.
@@ -255,7 +256,7 @@ TEST_F(CertDatabaseNSSTest, ImportFromPKCS12InvalidFile) {
EXPECT_EQ(ERR_PKCS12_IMPORT_INVALID_FILE,
cert_db_.ImportFromPKCS12(slot_,
pkcs12_data,
- ASCIIToUTF16(""),
+ string16(),
true)); // is_extractable
// Test db should still be empty.
« no previous file with comments | « chrome/browser/webdata/web_database_migration_unittest.cc ('k') | ui/gfx/font_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698