Use explicit WebString <-> string16 conversion methods in storage API files (2)

content/renderer/dom_storage/webstoragearea_impl.cc

 // Copyright (c) 2012 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.
 
 #include "content/renderer/dom_storage/webstoragearea_impl.h"
 
 #include "base/lazy_instance.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
@@ skipping 33 matching lines @@
   g_all_areas_map.Pointer()->Remove(connection_id_);
   if (dispatcher())
     dispatcher()->CloseCachedArea(connection_id_, cached_area_.get());
 }
 
 unsigned WebStorageAreaImpl::length() {
   return cached_area_->GetLength(connection_id_);
 }
 
 WebString WebStorageAreaImpl::key(unsigned index) {
-  return cached_area_->GetKey(connection_id_, index);
+  return WebString::fromUTF16(cached_area_->GetKey(connection_id_, index));
 }
 
 WebString WebStorageAreaImpl::getItem(const WebString& key) {
-  return cached_area_->GetItem(connection_id_, key);
+  return WebString::fromUTF16(
+      cached_area_->GetItem(connection_id_, key.utf16()));
 }
 
 void WebStorageAreaImpl::setItem(
     const WebString& key, const WebString& value, const WebURL& page_url,
     WebStorageArea::Result& result) {
-  if (!cached_area_->SetItem(connection_id_, key, value, page_url))
+  if (!cached_area_->SetItem(connection_id_, key.utf16(), value.utf16(),
+                             page_url))
     result = ResultBlockedByQuota;
   else
     result = ResultOK;
 }
 
 void WebStorageAreaImpl::removeItem(
     const WebString& key, const WebURL& page_url) {
-  cached_area_->RemoveItem(connection_id_, key, page_url);
+  cached_area_->RemoveItem(connection_id_, key.utf16(), page_url);
 }
 
 void WebStorageAreaImpl::clear(const WebURL& page_url) {
   cached_area_->Clear(connection_id_, page_url);
 }
 
 }  // namespace content