Replacing Indexed DB Chromium IPC with Mojo

content/browser/indexed_db/indexed_db_metadata.h

Index: content/browser/indexed_db/indexed_db_metadata.h
diff --git a/content/browser/indexed_db/indexed_db_metadata.h b/content/browser/indexed_db/indexed_db_metadata.h
index ec9d9acbcb8b2a54381a1081118befff5acfe162..56f3183f56370eba2904872deda28e21ae74c9b6 100644
--- a/content/browser/indexed_db/indexed_db_metadata.h
+++ b/content/browser/indexed_db/indexed_db_metadata.h
@@ -35,8 +35,6 @@ struct CONTENT_EXPORT IndexedDBIndexMetadata {
 };
 
 struct CONTENT_EXPORT IndexedDBObjectStoreMetadata {
-  typedef std::map<int64_t, IndexedDBIndexMetadata> IndexMap;
-
   static const int64_t kInvalidId = -1;
 
   IndexedDBObjectStoreMetadata();
@@ -56,15 +54,13 @@ struct CONTENT_EXPORT IndexedDBObjectStoreMetadata {
   bool auto_increment;
   int64_t max_index_id;
 
-  IndexMap indexes;
+  std::map<int64_t, IndexedDBIndexMetadata> indexes;
 };
 
 struct CONTENT_EXPORT IndexedDBDatabaseMetadata {
   // TODO(jsbell): These can probably be collapsed into 0.
   enum { NO_VERSION = -1, DEFAULT_VERSION = 0 };
 
-  typedef std::map<int64_t, IndexedDBObjectStoreMetadata> ObjectStoreMap;
-
   IndexedDBDatabaseMetadata();
   IndexedDBDatabaseMetadata(const base::string16& name,
                             int64_t id,
@@ -72,14 +68,14 @@ struct CONTENT_EXPORT IndexedDBDatabaseMetadata {
                             int64_t max_object_store_id);
   IndexedDBDatabaseMetadata(const IndexedDBDatabaseMetadata& other);
   ~IndexedDBDatabaseMetadata();
-  IndexedDBDatabaseMetadata& operator=(IndexedDBDatabaseMetadata& other);
+  IndexedDBDatabaseMetadata& operator=(const IndexedDBDatabaseMetadata& other);
 
   base::string16 name;
   int64_t id;
   int64_t version;
   int64_t max_object_store_id;
 
-  ObjectStoreMap object_stores;
+  std::map<int64_t, IndexedDBObjectStoreMetadata> object_stores;
 };
 }  // namespace content