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

content/renderer/dom_storage/local_storage_cached_area.cc

 // Copyright 2016 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/local_storage_cached_area.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/rand_util.h"
 #include "base/strings/string16.h"
@@ skipping 162 matching lines @@
     // remove it from our cache if we haven't already changed it and are waiting
     // for the confirmation callback. In the latter case, we won't do anything
     // because ignore_key_mutations_ won't be updated until the callback runs.
     if (ignore_key_mutations_.find(key_string) != ignore_key_mutations_.end()) {
       base::string16 unused;
       map_->RemoveItem(key_string, &unused);
     }
   }
 
   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) {
   GURL page_url;
   std::string storage_area_id;
   UnpackSource(source, &page_url, &storage_area_id);
 
   blink::WebStorageArea* originating_area = nullptr;
   if (areas_.find(storage_area_id) != areas_.end()) {
     // The source storage area is in this process.
     originating_area = areas_[storage_area_id];
   } else if (map_ && !ignore_all_mutations_) {
     scoped_refptr<DOMStorageMap> old = map_;
     map_ = new DOMStorageMap(kPerStorageAreaQuota);
 
     // We have to retain local additions which happened after this clear
     // operation from another process.
     auto iter = ignore_key_mutations_.begin();
     while (iter != ignore_key_mutations_.end()) {
       base::NullableString16 value = old->GetItem(iter->first);
       if (!value.is_null()) {
         base::NullableString16 unused;
         map_->SetItem(iter->first, value.string(), &unused);
       }
       ++iter;
     }
   }
 
   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) {
   // Since the GetAll method is synchronous, we need this asynchronously
   // delivered notification to avoid applying changes to the returned array
   // that we already have.
   if (source == get_all_request_id_) {
     DCHECK(ignore_all_mutations_);
     DCHECK(!get_all_request_id_.empty());
     ignore_all_mutations_ = false;
@@ skipping 26 matching lines @@
       // We turn off quota checking here to accomodate the over budget allowance
       // that's provided in the browser process.
       base::NullableString16 unused;
       map_->set_quota(std::numeric_limits<int32_t>::max());
       map_->SetItem(key_string, new_value_string, &unused);
       map_->set_quota(kPerStorageAreaQuota);
     }
   }
 
   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);
 }
 
 void LocalStorageCachedArea::EnsureLoaded() {
   if (map_)
     return;
 
   base::TimeTicks before = base::TimeTicks::Now();
   ignore_all_mutations_ = true;
   get_all_request_id_ = base::Uint64ToString(base::RandUint64());
@@ skipping 61 matching lines @@
 }
 
 void LocalStorageCachedArea::Reset() {
   map_ = NULL;
   ignore_key_mutations_.clear();
   ignore_all_mutations_ = false;
   weak_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace content