Snapshot of all changes to get jumbo in blink and content.

content/browser/indexed_db/leveldb/leveldb_database.cc

 // Copyright (c) 2013 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/indexed_db/leveldb/leveldb_database.h"
 
 #include <inttypes.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 60 matching lines @@
   leveldb::Env* env_;
   leveldb::FileLock* lock_;
 
   DISALLOW_COPY_AND_ASSIGN(LockImpl);
 };
 
 leveldb::Slice MakeSlice(const StringPiece& s) {
   return leveldb::Slice(s.begin(), s.size());
 }
 
-StringPiece MakeStringPiece(const leveldb::Slice& s) {
+// Identical function in indexed_db/indexed_db_tombstone_sweeper.cc.
+StringPiece LevelDB_MakeStringPiece(const leveldb::Slice& s) {
   return StringPiece(s.data(), s.size());
 }
 
 class ComparatorAdapter : public leveldb::Comparator {
  public:
   explicit ComparatorAdapter(const LevelDBComparator* comparator)
       : comparator_(comparator) {}
 
   int Compare(const leveldb::Slice& a, const leveldb::Slice& b) const override {
-    return comparator_->Compare(MakeStringPiece(a), MakeStringPiece(b));
+    return comparator_->Compare(LevelDB_MakeStringPiece(a), LevelDB_MakeStringPiece(b));
   }
 
   const char* Name() const override { return comparator_->Name(); }
 
   // TODO(jsbell): Support the methods below in the future.
   void FindShortestSeparator(std::string* start,
                              const leveldb::Slice& limit) const override {}
 
   void FindShortSuccessor(std::string* key) const override {}
 
@@ skipping 427 matching lines @@
 void LevelDBDatabase::OnIteratorDestroyed(LevelDBIterator* iter) {
   DCHECK_GT(num_iterators_, 0u);
   --num_iterators_;
   auto it = iterator_lru_.Peek(iter);
   if (it == iterator_lru_.end())
     return;
   iterator_lru_.Erase(it);
 }
 
 }  // namespace content