[Leveldb] Use std::{string,vector} instead of mojo::{String,Array}.

content/browser/leveldb_wrapper_impl.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/browser/leveldb_wrapper_impl.h"
 
 #include "base/bind.h"
 #include "base/threading/thread_task_runner_handle.h"
+#include "components/leveldb/public/cpp/util.h"
 #include "content/public/browser/browser_thread.h"
-#include "mojo/common/common_type_converters.h"
 
 namespace content {
 
 bool LevelDBWrapperImpl::s_aggressive_flushing_enabled_ = false;
 
 LevelDBWrapperImpl::RateLimiter::RateLimiter(size_t desired_rate,
                                             base::TimeDelta time_quantum)
     : rate_(desired_rate), samples_(0), time_quantum_(time_quantum) {
   DCHECK_GT(desired_rate, 0ul);
 }
@@ skipping 221 matching lines @@
   no_bindings_callback_.Run();
 }
 
 void LevelDBWrapperImpl::LoadMap(const base::Closure& completion_callback) {
   DCHECK(!map_);
   on_load_complete_tasks_.push_back(completion_callback);
   if (on_load_complete_tasks_.size() > 1)
     return;
 
   // TODO(michaeln): Import from sqlite localstorage db.
-  database_->GetPrefixed(mojo::Array<uint8_t>::From(prefix_),
+  database_->GetPrefixed(leveldb::StdStringToUint8Vector(prefix_),
                          base::Bind(&LevelDBWrapperImpl::OnLoadComplete,
                                     weak_ptr_factory_.GetWeakPtr()));
 }
 
 void LevelDBWrapperImpl::OnLoadComplete(
     leveldb::mojom::DatabaseError status,
-    mojo::Array<leveldb::mojom::KeyValuePtr> data) {
+    std::vector<leveldb::mojom::KeyValuePtr> data) {
   DCHECK(!map_);
   map_.reset(new ValueMap);
   for (auto& it : data)
-    (*map_)[it->key.PassStorage()] = it->value.PassStorage();
+    (*map_)[it->key] = it->value;
 
   // We proceed without using a backing store, nothing will be persisted but the
   // class is functional for the lifetime of the object.
   // TODO(michaeln): Uma here or in the DB file?
   if (status != leveldb::mojom::DatabaseError::OK)
     database_ = nullptr;
 
   std::vector<base::Closure> tasks;
   on_load_complete_tasks_.swap(tasks);
   for (auto& task : tasks)
@@ skipping 42 matching lines @@
 
 void LevelDBWrapperImpl::CommitChanges() {
   DCHECK(database_);
   if (commit_batch_)
     return;
 
   commit_rate_limiter_.add_samples(1);
   data_rate_limiter_.add_samples(commit_batch_->GetDataSize());
 
   // Commit all our changes in a single batch.
-  mojo::Array<leveldb::mojom::BatchedOperationPtr> operations;
+  std::vector<leveldb::mojom::BatchedOperationPtr> operations;
   if (commit_batch_->clear_all_first) {
     leveldb::mojom::BatchedOperationPtr item =
         leveldb::mojom::BatchedOperation::New();
     item->type = leveldb::mojom::BatchOperationType::DELETE_PREFIXED_KEY;
-    item->key = mojo::Array<uint8_t>::From(std::string(prefix_));
+    item->key = leveldb::StdStringToUint8Vector(prefix_);
     operations.push_back(std::move(item));
   }
   for (auto& it : commit_batch_->changed_values) {
     leveldb::mojom::BatchedOperationPtr item =
         leveldb::mojom::BatchedOperation::New();
-    item->key = std::vector<uint8_t>(it.first);
+    item->key = std::move(it.first);
     if (!it.second) {
       item->type = leveldb::mojom::BatchOperationType::DELETE_KEY;
     } else {
       item->type = leveldb::mojom::BatchOperationType::PUT_KEY;
       item->value = std::move(*(it.second));
     }
     operations.push_back(std::move(item));
   }
   commit_batch_.reset();
 
   ++commit_batches_in_flight_;
 
   // TODO(michaeln): Currently there is no guarantee LevelDBDatabaseImp::Write
   // will run during a clean shutdown. We need that to avoid dataloss.
   database_->Write(std::move(operations),
                    base::Bind(&LevelDBWrapperImpl::OnCommitComplete,
                               weak_ptr_factory_.GetWeakPtr()));
 }
 
 void LevelDBWrapperImpl::OnCommitComplete(leveldb::mojom::DatabaseError error) {
   // TODO(michaeln): What if it fails, uma here or in the DB class?
   --commit_batches_in_flight_;
   StartCommitTimer();
 }
 
 }  // namespace content