WebString: makes string16 conversions explicit (part 1: blink, content)

content/renderer/dom_storage/local_storage_cached_area.cc

Index: content/renderer/dom_storage/local_storage_cached_area.cc
diff --git a/content/renderer/dom_storage/local_storage_cached_area.cc b/content/renderer/dom_storage/local_storage_cached_area.cc
index 7eb9efbd24ee79c390cc84b277dae192d6015290..4b8820bf3dfe1f683900afd11fbde85c4b23daa7 100644
--- a/content/renderer/dom_storage/local_storage_cached_area.cc
+++ b/content/renderer/dom_storage/local_storage_cached_area.cc
@@ -180,8 +180,9 @@ void LocalStorageCachedArea::KeyDeleted(const std::vector<uint8_t>& key,
   }
 
   blink::WebStorageEventDispatcher::dispatchLocalStorageEvent(
-      key_string, Uint8VectorToString16(old_value), base::NullableString16(),
-      origin_.GetURL(), page_url, originating_area);
+      blink::WebString::fromUTF16(key_string),
+      blink::WebString::fromUTF16(Uint8VectorToString16(old_value)),
+      blink::WebString(), origin_.GetURL(), page_url, originating_area);
 }
 
 void LocalStorageCachedArea::AllDeleted(const std::string& source) {
@@ -211,8 +212,8 @@ void LocalStorageCachedArea::AllDeleted(const std::string& source) {
   }
 
   blink::WebStorageEventDispatcher::dispatchLocalStorageEvent(
-      base::NullableString16(), base::NullableString16(),
-      base::NullableString16(), origin_.GetURL(), page_url, originating_area);
+      blink::WebString(), blink::WebString(), blink::WebString(),
+      origin_.GetURL(), page_url, originating_area);
 }
 
 void LocalStorageCachedArea::GetAllComplete(const std::string& source) {
@@ -259,7 +260,9 @@ void LocalStorageCachedArea::KeyAddedOrChanged(
   }
 
   blink::WebStorageEventDispatcher::dispatchLocalStorageEvent(
-      key_string, old_value, new_value_string, origin_.GetURL(), page_url,
+      blink::WebString::fromUTF16(key_string),
+      blink::WebString::fromUTF16(old_value),
+      blink::WebString::fromUTF16(new_value_string), origin_.GetURL(), page_url,
       originating_area);
 }