Switch on use_new_wrapper_types mode for content/common.

content/browser/leveldb_wrapper_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_LEVELDB_WRAPPER_IMPL_H_
 #define CONTENT_BROWSER_LEVELDB_WRAPPER_IMPL_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
+#include "base/optional.h"
 #include "base/time/time.h"
 #include "content/common/leveldb_wrapper.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 
 namespace content {
 
 // This is a wrapper around a leveldb::mojom::LevelDBDatabase. Multiple
 // interface
 // pointers can be bound to the same object. The wrapper adds a couple of
@@ skipping 20 matching lines @@
   void Bind(mojom::LevelDBWrapperRequest request);
   void AddObserver(mojom::LevelDBObserverPtr observer);
 
   // Commence aggressive flushing. This should be called early during startup,
   // before any localStorage writing. Currently scheduled writes will not be
   // rescheduled and will be flushed at the scheduled time after which
   // aggressive flushing will commence.
   static void EnableAggressiveCommitDelay();
 
  private:
-  using ValueMap = std::map<mojo::Array<uint8_t>, mojo::Array<uint8_t>>;
+  using ValueMap =
+      std::map<std::vector<uint8_t>, base::Optional<std::vector<uint8_t>>>;

[michaeln, 2016/08/02 00:28:29]

why is the value type optional?

[leonhsl(Using Gerrit), 2016/08/02 11:11:05]

Yeah, it is to distinguish between puts and deletes, null value means a delete.

 
   // Used to rate limit commits.
   class RateLimiter {
    public:
     RateLimiter(size_t desired_rate, base::TimeDelta time_quantum);
 
     void add_samples(size_t samples) { samples_ += samples;  }
 
     // Computes the total time needed to process the total samples seen
     // at the desired rate.
@@ skipping 14 matching lines @@
   struct CommitBatch {
     bool clear_all_first;
     ValueMap changed_values;
 
     CommitBatch();
     ~CommitBatch();
     size_t GetDataSize() const;
   };
 
   // LevelDBWrapperImpl:
-  void Put(mojo::Array<uint8_t> key,
-           mojo::Array<uint8_t> value,
-           const mojo::String& source,
+  void Put(const std::vector<uint8_t>& key,
+           const std::vector<uint8_t>& value,
+           const std::string& source,
            const PutCallback& callback) override;
-  void Delete(mojo::Array<uint8_t> key,
-              const mojo::String& source,
+  void Delete(const std::vector<uint8_t>& key,
+              const std::string& source,
               const DeleteCallback& callback) override;
-  void DeleteAll(const mojo::String& source,
+  void DeleteAll(const std::string& source,
                  const DeleteAllCallback& callback) override;
-  void Get(mojo::Array<uint8_t> key, const GetCallback& callback) override;
-  void GetAll(const mojo::String& source,
+  void Get(const std::vector<uint8_t>& key,
+           const GetCallback& callback) override;
+  void GetAll(const std::string& source,
               const GetAllCallback& callback) override;
 
   void OnConnectionError();
   void LoadMap(const base::Closure& completion_callback);
   void OnLoadComplete(leveldb::mojom::DatabaseError status,
                       mojo::Array<leveldb::mojom::KeyValuePtr> data);
   void CreateCommitBatchIfNeeded();
   void StartCommitTimer();
   base::TimeDelta ComputeCommitDelay() const;
   void CommitChanges();
@@ skipping 17 matching lines @@
   base::WeakPtrFactory<LevelDBWrapperImpl> weak_ptr_factory_;
 
   static bool s_aggressive_flushing_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(LevelDBWrapperImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LEVELDB_WRAPPER_IMPL_H_