Switch on use_new_wrapper_types mode for content/common.

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"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/time/time.h"
 #include "content/common/dom_storage/dom_storage_map.h"
 #include "content/common/storage_partition_service.mojom.h"
 #include "content/renderer/dom_storage/local_storage_area.h"
 #include "content/renderer/dom_storage/local_storage_cached_areas.h"
-#include "mojo/common/common_type_converters.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebStorageEventDispatcher.h"
 #include "url/gurl.h"
 
+namespace {
+
+base::string16 Uint8VectorToString16(const std::vector<uint8_t>& input) {
+  if (input.empty())
+    return base::string16();
+
+  return base::string16(reinterpret_cast<const base::char16*>(&input.front()),

[kinuko, 2016/08/15 23:05:55]

nit: use input.data() instead of &input.front() and remove if (input.empty())
condition?

[leonhsl(Using Gerrit), 2016/08/16 05:54:32]

Done.

+                        input.size() / sizeof(base::char16));
+}
+
+std::vector<uint8_t> String16ToUint8Vector(const base::string16& input) {
+  std::vector<uint8_t> result(input.size() * sizeof(base::char16));
+  if (!input.empty())
+    memcpy(&result.front(), input.c_str(), input.size() * sizeof(base::char16));

[kinuko, 2016/08/15 23:05:55]

Hmm... could something like this work?

const uint8_t* data = reinterpret_cast<const uint8_t*>(input.data());
return std::vector<uint8_t>(data, data + input.size() * sizeof(base::char16));

[leonhsl(Using Gerrit), 2016/08/16 05:54:32]

Done and thanks! The code looks cleaner.

+  return result;
+}
+
+}  // namespace
+
 namespace content {
 
 // These methods are used to pack and unpack the page_url/storage_area_id into
 // source strings to/from the browser.
 std::string PackSource(const GURL& page_url,
                        const std::string& storage_area_id) {
   return page_url.spec() + "\n" + storage_area_id;
 }
 
-void UnpackSource(const mojo::String& source,
+void UnpackSource(const std::string& source,
                   GURL* page_url,
                   std::string* storage_area_id) {
   std::vector<std::string> result = base::SplitString(
-      source.To<std::string>(), "\n", base::KEEP_WHITESPACE,
-      base::SPLIT_WANT_ALL);
+      source, "\n", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL);
   DCHECK_EQ(result.size(), 2u);
   *page_url = GURL(result[0]);
   *storage_area_id = result[1];
 }
 
 LocalStorageCachedArea::LocalStorageCachedArea(
     const url::Origin& origin,
     mojom::StoragePartitionService* storage_partition_service,
     LocalStorageCachedAreas* cached_areas)
     : origin_(origin), binding_(this),
@@ skipping 31 matching lines @@
   if (key.length() + value.length() > kPerStorageAreaQuota)
     return false;
 
   EnsureLoaded();
   base::NullableString16 unused;
   if (!map_->SetItem(key, value, &unused))
     return false;
 
   // Ignore mutations to |key| until OnSetItemComplete.
   ignore_key_mutations_[key]++;
-  leveldb_->Put(mojo::Array<uint8_t>::From(key),
-                mojo::Array<uint8_t>::From(value),
+  leveldb_->Put(String16ToUint8Vector(key), String16ToUint8Vector(value),
                 PackSource(page_url, storage_area_id),
                 base::Bind(&LocalStorageCachedArea::OnSetItemComplete,
                            weak_factory_.GetWeakPtr(), key));
   return true;
 }
 
 void LocalStorageCachedArea::RemoveItem(const base::string16& key,
                                         const GURL& page_url,
                                         const std::string& storage_area_id) {
   EnsureLoaded();
   base::string16 unused;
   if (!map_->RemoveItem(key, &unused))
     return;
 
   // Ignore mutations to |key| until OnRemoveItemComplete.
   ignore_key_mutations_[key]++;
-  leveldb_->Delete(mojo::Array<uint8_t>::From(key),
+  leveldb_->Delete(String16ToUint8Vector(key),
                    PackSource(page_url, storage_area_id),
                    base::Bind(&LocalStorageCachedArea::OnRemoveItemComplete,
                               weak_factory_.GetWeakPtr(), key));
 }
 
 void LocalStorageCachedArea::Clear(const GURL& page_url,
                                    const std::string& storage_area_id) {
   // No need to prime the cache in this case.
 
   Reset();
   map_ = new DOMStorageMap(kPerStorageAreaQuota);
   ignore_all_mutations_ = true;
   leveldb_->DeleteAll(PackSource(page_url, storage_area_id),
                       base::Bind(&LocalStorageCachedArea::OnClearComplete,
                                   weak_factory_.GetWeakPtr()));
 }
 
 void LocalStorageCachedArea::AreaCreated(LocalStorageArea* area) {
   areas_[area->id()] = area;
 }
 
 void LocalStorageCachedArea::AreaDestroyed(LocalStorageArea* area) {
   areas_.erase(area->id());
 }
 
-void LocalStorageCachedArea::KeyAdded(mojo::Array<uint8_t> key,
-                                      mojo::Array<uint8_t> value,
-                                      const mojo::String& source) {
+void LocalStorageCachedArea::KeyAdded(const std::vector<uint8_t>& key,
+                                      const std::vector<uint8_t>& value,
+                                      const std::string& source) {
   base::NullableString16 null_value;
-  KeyAddedOrChanged(std::move(key), std::move(value),
-                    null_value, source);
+  KeyAddedOrChanged(key, value, null_value, source);
 }
 
-void LocalStorageCachedArea::KeyChanged(mojo::Array<uint8_t> key,
-                                        mojo::Array<uint8_t> new_value,
-                                        mojo::Array<uint8_t> old_value,
-                                        const mojo::String& source) {
-  base::NullableString16 old_value_str(old_value.To<base::string16>(), false);
-  KeyAddedOrChanged(std::move(key), std::move(new_value),
-                    old_value_str, source);
+void LocalStorageCachedArea::KeyChanged(const std::vector<uint8_t>& key,
+                                        const std::vector<uint8_t>& new_value,
+                                        const std::vector<uint8_t>& old_value,
+                                        const std::string& source) {
+  base::NullableString16 old_value_str(Uint8VectorToString16(old_value), false);
+  KeyAddedOrChanged(key, new_value, old_value_str, source);
 }
 
-void LocalStorageCachedArea::KeyDeleted(mojo::Array<uint8_t> key,
-                                        mojo::Array<uint8_t> old_value,
-                                        const mojo::String& source) {
+void LocalStorageCachedArea::KeyDeleted(const std::vector<uint8_t>& key,
+                                        const std::vector<uint8_t>& old_value,
+                                        const std::string& source) {
   GURL page_url;
   std::string storage_area_id;
   UnpackSource(source, &page_url, &storage_area_id);
 
-  base::string16 key_string = key.To<base::string16>();
+  base::string16 key_string = Uint8VectorToString16(key);
 
   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_) {
     // This was from another process or the storage area is gone. If the former,
     // 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, old_value.To<base::string16>(), base::NullableString16(),
+      key_string, Uint8VectorToString16(old_value), base::NullableString16(),
       GURL(origin_.Serialize()), page_url, originating_area);
 }
 
-void LocalStorageCachedArea::AllDeleted(const mojo::String& source) {
+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_;
@@ skipping 11 matching lines @@
       ++iter;
     }
   }
 
   blink::WebStorageEventDispatcher::dispatchLocalStorageEvent(
       base::NullableString16(), base::NullableString16(),
       base::NullableString16(), GURL(origin_.Serialize()), page_url,
       originating_area);
 }
 
-void LocalStorageCachedArea::GetAllComplete(const mojo::String& source) {
+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.To<std::string>() == get_all_request_id_) {
+  if (source == get_all_request_id_) {
     DCHECK(ignore_all_mutations_);
     DCHECK(!get_all_request_id_.empty());
     ignore_all_mutations_ = false;
     get_all_request_id_.clear();
   }
 }
 
 void LocalStorageCachedArea::KeyAddedOrChanged(
-    mojo::Array<uint8_t> key,
-    mojo::Array<uint8_t> new_value,
+    const std::vector<uint8_t>& key,
+    const std::vector<uint8_t>& new_value,
     const base::NullableString16& old_value,
-    const mojo::String& source) {
+    const std::string& source) {
   GURL page_url;
   std::string storage_area_id;
   UnpackSource(source, &page_url, &storage_area_id);
 
-  base::string16 key_string = key.To<base::string16>();
-  base::string16 new_value_string = new_value.To<base::string16>();
+  base::string16 key_string = Uint8VectorToString16(key);
+  base::string16 new_value_string = Uint8VectorToString16(new_value);
 
   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_) {
     // This was from another process or the storage area is gone. If the former,
     // apply it to 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.
@@ skipping 14 matching lines @@
 }
 
 void LocalStorageCachedArea::EnsureLoaded() {
   if (map_)
     return;
 
   base::TimeTicks before = base::TimeTicks::Now();
   ignore_all_mutations_ = true;
   get_all_request_id_ = base::Uint64ToString(base::RandUint64());
   leveldb::mojom::DatabaseError status = leveldb::mojom::DatabaseError::OK;
-  mojo::Array<content::mojom::KeyValuePtr> data;
+  std::vector<content::mojom::KeyValuePtr> data;
   leveldb_->GetAll(get_all_request_id_, &status, &data);
 
   DOMStorageValuesMap values;
   for (size_t i = 0; i < data.size(); ++i) {
-    values[data[i]->key.To<base::string16>()] =
-        base::NullableString16(data[i]->value.To<base::string16>(), false);
+    values[Uint8VectorToString16(data[i]->key)] =
+        base::NullableString16(Uint8VectorToString16(data[i]->value), false);
   }
 
   map_ = new DOMStorageMap(kPerStorageAreaQuota);
   map_->SwapValues(&values);
 
   base::TimeDelta time_to_prime = base::TimeTicks::Now() - before;
   UMA_HISTOGRAM_TIMES("LocalStorage.MojoTimeToPrime", time_to_prime);
 
   size_t local_storage_size_kb = map_->bytes_used() / 1024;
   // Track localStorage size, from 0-6MB. Note that the maximum size should be
@@ skipping 43 matching lines @@
 }
 
 void LocalStorageCachedArea::Reset() {
   map_ = NULL;
   ignore_key_mutations_.clear();
   ignore_all_mutations_ = false;
   weak_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace content