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

content/browser/indexed_db/indexed_db_leveldb_coding.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_LEVELDB_CODING_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_LEVELDB_CODING_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 176 matching lines @@
 
  private:
   int64 database_id_;
 };
 
 class DatabaseNameKey {
  public:
   static const char* Decode(const char* start,
                             const char* limit,
                             DatabaseNameKey* result);
-  CONTENT_EXPORT static std::vector<char> Encode(const string16& origin,
-                                                 const string16& database_name);
-  static std::vector<char> EncodeMinKeyForOrigin(const string16& origin);
-  static std::vector<char> EncodeStopKeyForOrigin(const string16& origin);
+  CONTENT_EXPORT static std::vector<char> Encode(
+      const std::string& origin_identifier,
+      const string16& database_name);
+  static std::vector<char> EncodeMinKeyForOrigin(
+      const std::string& origin_identifier);
+  static std::vector<char> EncodeStopKeyForOrigin(
+      const std::string& origin_identifier);
   string16 origin() const { return origin_; }
   string16 database_name() const { return database_name_; }
   int Compare(const DatabaseNameKey& other);
 
  private:
   string16 origin_;  // TODO(jsbell): Store encoded strings, or just pointers.
   string16 database_name_;
 };
 
 class DatabaseMetaDataKey {
@@ skipping 119 matching lines @@
   static const char* Decode(const char* start,
                             const char* limit,
                             ObjectStoreNamesKey* result);
   CONTENT_EXPORT static std::vector<char> Encode(
       int64 database_id,
       const string16& object_store_name);
   int Compare(const ObjectStoreNamesKey& other);
   string16 object_store_name() const { return object_store_name_; }
 
  private:
-  string16
-      object_store_name_;  // TODO(jsbell): Store the encoded string, or just
-                           // pointers to it.
+  // TODO(jsbell): Store the encoded string, or just pointers to it.
+  string16 object_store_name_;
 };
 
 class IndexNamesKey {
  public:
   IndexNamesKey();
   // TODO(jsbell): We never use this to look up index ids, because a mapping
   // is kept at a higher level.
   static const char* Decode(const char* start,
                             const char* limit,
                             IndexNamesKey* result);
@@ skipping 93 matching lines @@
   std::vector<char> encoded_user_key_;
   std::vector<char> encoded_primary_key_;
   int64 sequence_number_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexDataKey);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_LEVELDB_CODING_H_