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

content/browser/indexed_db/indexed_db_backing_store.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 24 matching lines @@
       bool* is_disk_full = NULL) = 0;
   virtual bool DestroyLevelDB(const base::FilePath& file_name) = 0;
 };
 
 class CONTENT_EXPORT IndexedDBBackingStore
     : public base::RefCounted<IndexedDBBackingStore> {
  public:
   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();
   }
 
   virtual std::vector<string16> GetDatabaseNames();
   virtual bool GetIDBDatabaseMetaData(const string16& name,
                                       IndexedDBDatabaseMetadata* metadata,
                                       bool* success) WARN_UNUSED_RESULT;
   virtual bool CreateIDBDatabaseMetaData(const string16& name,
@@ skipping 211 matching lines @@
         Transaction* transaction) {
       return transaction->transaction_.get();
     }
 
    private:
     IndexedDBBackingStore* backing_store_;
     scoped_refptr<LevelDBTransaction> transaction_;
   };
 
  protected:
-  IndexedDBBackingStore(const string16& identifier,
+  IndexedDBBackingStore(const std::string& identifier,
                         scoped_ptr<LevelDBDatabase> db,
                         scoped_ptr<LevelDBComparator> comparator);
   virtual ~IndexedDBBackingStore();
   friend class base::RefCounted<IndexedDBBackingStore>;
 
  private:
   static scoped_refptr<IndexedDBBackingStore> Create(
-      const string16& identifier,
+      const std::string& identifier,
       scoped_ptr<LevelDBDatabase> db,
       scoped_ptr<LevelDBComparator> comparator);
 
   bool FindKeyInIndex(IndexedDBBackingStore::Transaction* transaction,
                       int64 database_id,
                       int64 object_store_id,
                       int64 index_id,
                       const IndexedDBKey& key,
                       std::vector<char>* found_encoded_primary_key,
                       bool* found);
   bool GetIndexes(int64 database_id,
                   int64 object_store_id,
                   IndexedDBObjectStoreMetadata::IndexMap* map)
       WARN_UNUSED_RESULT;
 
-  string16 identifier_;
+  std::string identifier_;
 
   scoped_ptr<LevelDBDatabase> db_;
   scoped_ptr<LevelDBComparator> comparator_;
   base::WeakPtrFactory<IndexedDBBackingStore> weak_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_BACKING_STORE_H_