| Index: content/browser/indexed_db/indexed_db_factory.h
|
| diff --git a/content/browser/indexed_db/indexed_db_factory.h b/content/browser/indexed_db/indexed_db_factory.h
|
| index 1b76d7946ccf064ce8c38f12a1b90ca03b180ae7..2f4df951b3739b820ef8f9fab06e1273d5759f6e 100644
|
| --- a/content/browser/indexed_db/indexed_db_factory.h
|
| +++ b/content/browser/indexed_db/indexed_db_factory.h
|
| @@ -34,19 +34,19 @@ class CONTENT_EXPORT IndexedDBFactory
|
| void RemoveIDBDatabaseBackend(const string16& unique_identifier);
|
|
|
| void GetDatabaseNames(scoped_refptr<IndexedDBCallbacks> callbacks,
|
| - const string16& database_identifier,
|
| + const std::string& origin_identifier,
|
| const base::FilePath& data_directory);
|
| void Open(const string16& name,
|
| int64 version,
|
| int64 transaction_id,
|
| scoped_refptr<IndexedDBCallbacks> callbacks,
|
| scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
|
| - const string16& database_identifier,
|
| + const std::string& origin_identifier,
|
| const base::FilePath& data_directory);
|
|
|
| void DeleteDatabase(const string16& name,
|
| scoped_refptr<IndexedDBCallbacks> callbacks,
|
| - const string16& database_identifier,
|
| + const std::string& origin_identifier,
|
| const base::FilePath& data_directory);
|
|
|
| protected:
|
| @@ -56,7 +56,7 @@ class CONTENT_EXPORT IndexedDBFactory
|
| virtual ~IndexedDBFactory();
|
|
|
| scoped_refptr<IndexedDBBackingStore> OpenBackingStore(
|
| - const string16& database_identifier,
|
| + const std::string& origin_identifier,
|
| const base::FilePath& data_directory,
|
| WebKit::WebIDBCallbacks::DataLoss* data_loss);
|
|
|
| @@ -65,7 +65,7 @@ class CONTENT_EXPORT IndexedDBFactory
|
| IndexedDBDatabaseMap;
|
| IndexedDBDatabaseMap database_backend_map_;
|
|
|
| - typedef std::map<string16, base::WeakPtr<IndexedDBBackingStore> >
|
| + typedef std::map<std::string, base::WeakPtr<IndexedDBBackingStore> >
|
| IndexedDBBackingStoreMap;
|
| IndexedDBBackingStoreMap backing_store_map_;
|
|
|
|
|