diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
commit | fcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch) | |
tree | d41b14e6526a822b66d692f60dc8f648a2afb3cd /content/common/indexed_db/indexed_db_param_traits.cc | |
parent | 426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff) | |
download | chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2 |
Convert string16 to base::string16 in content.
BUG=
Review URL: https://codereview.chromium.org/102593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/indexed_db/indexed_db_param_traits.cc')
-rw-r--r-- | content/common/indexed_db/indexed_db_param_traits.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/common/indexed_db/indexed_db_param_traits.cc b/content/common/indexed_db/indexed_db_param_traits.cc index 94b2053..0a566e2 100644 --- a/content/common/indexed_db/indexed_db_param_traits.cc +++ b/content/common/indexed_db/indexed_db_param_traits.cc @@ -82,7 +82,7 @@ bool ParamTraits<IndexedDBKey>::Read(const Message* m, return true; } case WebIDBKeyTypeString: { - string16 string; + base::string16 string; if (!ReadParam(m, iter, &string)) return false; *r = IndexedDBKey(string); @@ -156,14 +156,14 @@ bool ParamTraits<IndexedDBKeyPath>::Read(const Message* m, switch (type) { case WebIDBKeyPathTypeArray: { - std::vector<string16> array; + std::vector<base::string16> array; if (!ReadParam(m, iter, &array)) return false; *r = IndexedDBKeyPath(array); return true; } case WebIDBKeyPathTypeString: { - string16 string; + base::string16 string; if (!ReadParam(m, iter, &string)) return false; *r = IndexedDBKeyPath(string); @@ -184,7 +184,7 @@ void ParamTraits<IndexedDBKeyPath>::Log(const param_type& p, std::string* l) { LogParam(p.string(), l); l->append(", "); l->append("["); - std::vector<string16>::const_iterator it = p.array().begin(); + std::vector<base::string16>::const_iterator it = p.array().begin(); while (it != p.array().end()) { LogParam(*it, l); ++it; |