| Index: webkit/database/database_quota_client.cc
|
| diff --git a/webkit/database/database_quota_client.cc b/webkit/database/database_quota_client.cc
|
| index 1f55d9ad6e88ed54029148db404b6552b908dffc..840e36751e8790afd174640e81d7879c703f0d7b 100644
|
| --- a/webkit/database/database_quota_client.cc
|
| +++ b/webkit/database/database_quota_client.cc
|
| @@ -36,9 +36,9 @@ int64 GetOriginUsageOnDBThread(
|
| void GetOriginsOnDBThread(
|
| DatabaseTracker* db_tracker,
|
| std::set<GURL>* origins_ptr) {
|
| - std::vector<string16> origin_identifiers;
|
| + std::vector<base::string16> origin_identifiers;
|
| if (db_tracker->GetAllOriginIdentifiers(&origin_identifiers)) {
|
| - for (std::vector<string16>::const_iterator iter =
|
| + for (std::vector<base::string16>::const_iterator iter =
|
| origin_identifiers.begin();
|
| iter != origin_identifiers.end(); ++iter) {
|
| GURL origin = DatabaseUtil::GetOriginFromIdentifier(*iter);
|
| @@ -51,9 +51,9 @@ void GetOriginsForHostOnDBThread(
|
| DatabaseTracker* db_tracker,
|
| std::set<GURL>* origins_ptr,
|
| const std::string& host) {
|
| - std::vector<string16> origin_identifiers;
|
| + std::vector<base::string16> origin_identifiers;
|
| if (db_tracker->GetAllOriginIdentifiers(&origin_identifiers)) {
|
| - for (std::vector<string16>::const_iterator iter =
|
| + for (std::vector<base::string16>::const_iterator iter =
|
| origin_identifiers.begin();
|
| iter != origin_identifiers.end(); ++iter) {
|
| GURL origin = DatabaseUtil::GetOriginFromIdentifier(*iter);
|
|
|