| Index: content/browser/indexed_db/indexed_db_metadata.cc
|
| diff --git a/content/browser/indexed_db/indexed_db_metadata.cc b/content/browser/indexed_db/indexed_db_metadata.cc
|
| index 80d31424c5fe69dda84ed63d483068274836bfe2..47b7219f15bd5d8f306b6cfe02edd3b266fb393d 100644
|
| --- a/content/browser/indexed_db/indexed_db_metadata.cc
|
| +++ b/content/browser/indexed_db/indexed_db_metadata.cc
|
| @@ -7,7 +7,7 @@
|
| namespace content {
|
|
|
| IndexedDBObjectStoreMetadata::IndexedDBObjectStoreMetadata(
|
| - const string16& name,
|
| + const base::string16& name,
|
| int64 id,
|
| const IndexedDBKeyPath& key_path,
|
| bool auto_increment,
|
| @@ -23,11 +23,12 @@ IndexedDBObjectStoreMetadata::~IndexedDBObjectStoreMetadata() {}
|
|
|
| IndexedDBDatabaseMetadata::IndexedDBDatabaseMetadata()
|
| : int_version(NO_INT_VERSION) {}
|
| -IndexedDBDatabaseMetadata::IndexedDBDatabaseMetadata(const string16& name,
|
| - int64 id,
|
| - const string16& version,
|
| - int64 int_version,
|
| - int64 max_object_store_id)
|
| +IndexedDBDatabaseMetadata::IndexedDBDatabaseMetadata(
|
| + const base::string16& name,
|
| + int64 id,
|
| + const base::string16& version,
|
| + int64 int_version,
|
| + int64 max_object_store_id)
|
| : name(name),
|
| id(id),
|
| version(version),
|
|
|