summaryrefslogtreecommitdiffstats
path: root/webkit/dom_storage
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-06 14:46:06 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-06 14:46:06 +0000
commit0944741242d9ed32323b06a8026a62b89de2a9bf (patch)
tree77d7915d5222cd38e35a7c55f6725ead479cd3d8 /webkit/dom_storage
parent4dde4c672d45c4c01e5e78f8527bcdc1c7ba561d (diff)
downloadchromium_src-0944741242d9ed32323b06a8026a62b89de2a9bf.zip
chromium_src-0944741242d9ed32323b06a8026a62b89de2a9bf.tar.gz
chromium_src-0944741242d9ed32323b06a8026a62b89de2a9bf.tar.bz2
webkit: Instead of doing a conversion just use string16().
See chromium-dev thread for reference: https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/ec912e667c6fdec8# After landing this patch there will be zero entries of ASCIIToUTF16(""); R=tony@chromium.org Review URL: https://chromiumcodereview.appspot.com/10317028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135592 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/dom_storage')
-rw-r--r--webkit/dom_storage/dom_storage_database_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/dom_storage/dom_storage_database_unittest.cc b/webkit/dom_storage/dom_storage_database_unittest.cc
index e45a5c2..b11ea89 100644
--- a/webkit/dom_storage/dom_storage_database_unittest.cc
+++ b/webkit/dom_storage/dom_storage_database_unittest.cc
@@ -91,7 +91,7 @@ void CreateMapWithValues(ValuesMap* values) {
NullableString16(ASCIIToUTF16("123"), false),
NullableString16(ASCIIToUTF16("Google"), false),
NullableString16(ASCIIToUTF16("18-01-2012"), false),
- NullableString16(ASCIIToUTF16(""), false)
+ NullableString16(string16(), false)
};
for (unsigned i = 0; i < sizeof(kCannedKeys) / sizeof(kCannedKeys[0]); i++)
(*values)[kCannedKeys[i]] = kCannedValues[i];