Switch database/file_identifier to std::string, remove createFromDatabaseIdentifier calls

content/browser/indexed_db/indexed_db_backing_store.h

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 fef455f667acf005433eca99e863a184642f0c54..69e5c5e607a2da3cc0bef116bae5c67b5ff9ee24 100644
--- a/content/browser/indexed_db/indexed_db_backing_store.h
+++ b/content/browser/indexed_db/indexed_db_backing_store.h
@@ -42,18 +42,18 @@ class CONTENT_EXPORT IndexedDBBackingStore
   class CONTENT_EXPORT Transaction;
 
   static scoped_refptr<IndexedDBBackingStore> Open(
-      const string16& database_identifier,
+      const std::string& origin_identifier,
       const base::FilePath& path_base,
-      const string16& file_identifier);
+      const std::string& file_identifier);
   static scoped_refptr<IndexedDBBackingStore> Open(
-      const string16& database_identifier,
+      const std::string& origin_identifier,
       const base::FilePath& path_base,
-      const string16& file_identifier,
+      const std::string& file_identifier,
       LevelDBFactory* factory);
   static scoped_refptr<IndexedDBBackingStore> OpenInMemory(
-      const string16& identifier);
+      const std::string& file_identifier);

[jsbell, 2013/06/20 16:38:40]

file_identifier for OpenInMemory is a little odd; we should probably rename it
everywhere or put a comment somewhere that it's the identifier used *within* the
backing store data for historical reasons. That doesn't have to be this CL,
though.

   static scoped_refptr<IndexedDBBackingStore> OpenInMemory(
-      const string16& identifier,
+      const std::string& file_identifier,
       LevelDBFactory* factory);
   base::WeakPtr<IndexedDBBackingStore> GetWeakPtr() {
     return weak_factory_.GetWeakPtr();
@@ -285,7 +285,7 @@ class CONTENT_EXPORT IndexedDBBackingStore
   };
 
  protected:
-  IndexedDBBackingStore(const string16& identifier,
+  IndexedDBBackingStore(const std::string& identifier,
                         scoped_ptr<LevelDBDatabase> db,
                         scoped_ptr<LevelDBComparator> comparator);
   virtual ~IndexedDBBackingStore();
@@ -293,7 +293,7 @@ class CONTENT_EXPORT IndexedDBBackingStore
 
  private:
   static scoped_refptr<IndexedDBBackingStore> Create(
-      const string16& identifier,
+      const std::string& identifier,
       scoped_ptr<LevelDBDatabase> db,
       scoped_ptr<LevelDBComparator> comparator);
 
@@ -309,7 +309,7 @@ class CONTENT_EXPORT IndexedDBBackingStore
                   IndexedDBObjectStoreMetadata::IndexMap* map)
       WARN_UNUSED_RESULT;
 
-  string16 identifier_;
+  std::string identifier_;
 
   scoped_ptr<LevelDBDatabase> db_;
   scoped_ptr<LevelDBComparator> comparator_;