Index: content/browser/indexed_db/indexed_db_backing_store.h |
diff --git a/content/browser/indexed_db/indexed_db_backing_store.h b/content/browser/indexed_db/indexed_db_backing_store.h |
index 9ea71f11ac65fd6b18c42b5734b9cf320bd9fcf2..00b15a383bb8be386f038cb4777735e2dd034d2d 100644 |
--- a/content/browser/indexed_db/indexed_db_backing_store.h |
+++ b/content/browser/indexed_db/indexed_db_backing_store.h |
@@ -69,19 +69,19 @@ class CONTENT_EXPORT IndexedDBBackingStore |
const GURL& origin_url, |
LevelDBFactory* factory); |
- virtual std::vector<string16> GetDatabaseNames(); |
- virtual bool GetIDBDatabaseMetaData(const string16& name, |
+ virtual std::vector<base::string16> GetDatabaseNames(); |
+ virtual bool GetIDBDatabaseMetaData(const base::string16& name, |
IndexedDBDatabaseMetadata* metadata, |
bool* success) WARN_UNUSED_RESULT; |
- virtual bool CreateIDBDatabaseMetaData(const string16& name, |
- const string16& version, |
+ virtual bool CreateIDBDatabaseMetaData(const base::string16& name, |
+ const base::string16& version, |
int64 int_version, |
int64* row_id); |
virtual bool UpdateIDBDatabaseIntVersion( |
IndexedDBBackingStore::Transaction* transaction, |
int64 row_id, |
int64 int_version); |
- virtual bool DeleteDatabase(const string16& name); |
+ virtual bool DeleteDatabase(const base::string16& name); |
bool GetObjectStores(int64 database_id, |
IndexedDBDatabaseMetadata::ObjectStoreMap* map) |
@@ -90,7 +90,7 @@ class CONTENT_EXPORT IndexedDBBackingStore |
IndexedDBBackingStore::Transaction* transaction, |
int64 database_id, |
int64 object_store_id, |
- const string16& name, |
+ const base::string16& name, |
const IndexedDBKeyPath& key_path, |
bool auto_increment); |
virtual bool DeleteObjectStore( |
@@ -160,7 +160,7 @@ class CONTENT_EXPORT IndexedDBBackingStore |
int64 database_id, |
int64 object_store_id, |
int64 index_id, |
- const string16& name, |
+ const base::string16& name, |
const IndexedDBKeyPath& key_path, |
bool is_unique, |
bool is_multi_entry) WARN_UNUSED_RESULT; |