Port messages sent by WebIDBDatabaseImpl to Mojo.

content/browser/indexed_db/indexed_db_index_writer.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/indexed_db_index_writer.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
 
 using base::ASCIIToUTF16;
 
 namespace content {
 
 IndexWriter::IndexWriter(
     const IndexedDBIndexMetadata& index_metadata)
     : index_metadata_(index_metadata) {}
 
-IndexWriter::IndexWriter(
-    const IndexedDBIndexMetadata& index_metadata,
-    const IndexedDBDatabase::IndexKeys& index_keys)
+IndexWriter::IndexWriter(const IndexedDBIndexMetadata& index_metadata,
+                         const IndexedDBIndexKeys& index_keys)
     : index_metadata_(index_metadata), index_keys_(index_keys) {}
 
 IndexWriter::~IndexWriter() {}
 
 bool IndexWriter::VerifyIndexKeys(
     IndexedDBBackingStore* backing_store,
     IndexedDBBackingStore::Transaction* transaction,
     int64_t database_id,
     int64_t object_store_id,
     int64_t index_id,
@@ skipping 65 matching lines @@
                                                       &found_primary_key,
                                                       &found);
   if (!s.ok())
     return false;
   if (!found ||
       (primary_key.IsValid() && found_primary_key->Equals(primary_key)))
     *allowed = true;
   return true;
 }
 
-bool MakeIndexWriters(
-    IndexedDBTransaction* transaction,
-    IndexedDBBackingStore* backing_store,
-    int64_t database_id,
-    const IndexedDBObjectStoreMetadata& object_store,
-    const IndexedDBKey& primary_key,  // makes a copy
-    bool key_was_generated,
-    const std::vector<IndexedDBDatabase::IndexKeys>& index_keys,
-    std::vector<std::unique_ptr<IndexWriter>>* index_writers,
-    base::string16* error_message,
-    bool* completed) {
+bool MakeIndexWriters(IndexedDBTransaction* transaction,
+                      IndexedDBBackingStore* backing_store,
+                      int64_t database_id,
+                      const IndexedDBObjectStoreMetadata& object_store,
+                      const IndexedDBKey& primary_key,  // makes a copy
+                      bool key_was_generated,
+                      const std::vector<IndexedDBIndexKeys>& index_keys,
+                      std::vector<std::unique_ptr<IndexWriter>>* index_writers,
+                      base::string16* error_message,
+                      bool* completed) {
   *completed = false;
 
   for (const auto& it : index_keys) {
     const auto& found = object_store.indexes.find(it.first);
     if (found == object_store.indexes.end())
       continue;
     const IndexedDBIndexMetadata& index = found->second;
-    IndexedDBDatabase::IndexKeys keys = it;
+    IndexedDBIndexKeys keys = it;
 
     // If the object_store is using auto_increment, then any indexes with an
     // identical key_path need to also use the primary (generated) key as a key.
     if (key_was_generated && (index.key_path == object_store.key_path))
       keys.second.push_back(primary_key);
 
     std::unique_ptr<IndexWriter> index_writer(
         base::MakeUnique<IndexWriter>(index, keys));
     bool can_add_keys = false;
     bool backing_store_success =
@@ skipping 11 matching lines @@
       return true;
 
     index_writers->push_back(std::move(index_writer));
   }
 
   *completed = true;
   return true;
 }
 
 }  // namespace content