| Index: content/common/indexed_db/indexed_db_key_path.h
|
| diff --git a/content/common/indexed_db/indexed_db_key_path.h b/content/common/indexed_db/indexed_db_key_path.h
|
| index a17c193bd2004c740554a464fe657b194f0333ad..ec5e8611b235dc579321b8326e854b925ddfe32f 100644
|
| --- a/content/common/indexed_db/indexed_db_key_path.h
|
| +++ b/content/common/indexed_db/indexed_db_key_path.h
|
| @@ -17,21 +17,21 @@ namespace content {
|
| class CONTENT_EXPORT IndexedDBKeyPath {
|
| public:
|
| IndexedDBKeyPath(); // Defaults to blink::WebIDBKeyPathTypeNull.
|
| - explicit IndexedDBKeyPath(const string16&);
|
| - explicit IndexedDBKeyPath(const std::vector<string16>&);
|
| + explicit IndexedDBKeyPath(const base::string16&);
|
| + explicit IndexedDBKeyPath(const std::vector<base::string16>&);
|
| ~IndexedDBKeyPath();
|
|
|
| bool IsNull() const { return type_ == blink::WebIDBKeyPathTypeNull; }
|
| bool operator==(const IndexedDBKeyPath& other) const;
|
|
|
| blink::WebIDBKeyPathType type() const { return type_; }
|
| - const std::vector<string16>& array() const;
|
| - const string16& string() const;
|
| + const std::vector<base::string16>& array() const;
|
| + const base::string16& string() const;
|
|
|
| private:
|
| blink::WebIDBKeyPathType type_;
|
| - string16 string_;
|
| - std::vector<string16> array_;
|
| + base::string16 string_;
|
| + std::vector<base::string16> array_;
|
| };
|
|
|
| } // namespace content
|
|
|