| Index: webkit/database/database_util_unittest.cc
|
| diff --git a/webkit/database/database_util_unittest.cc b/webkit/database/database_util_unittest.cc
|
| index aa9d007ac9494f3a388bd6195936a204221c6173..bbbfcd6bc43c0aed64c35cd28b9b4c369390d6af 100644
|
| --- a/webkit/database/database_util_unittest.cc
|
| +++ b/webkit/database/database_util_unittest.cc
|
| @@ -14,9 +14,9 @@ static void TestVfsFilePath(bool expected_result,
|
| const char* expected_origin_identifier = "",
|
| const char* expected_database_name = "",
|
| const char* expected_sqlite_suffix = "") {
|
| - string16 origin_identifier;
|
| - string16 database_name;
|
| - string16 sqlite_suffix;
|
| + base::string16 origin_identifier;
|
| + base::string16 database_name;
|
| + base::string16 sqlite_suffix;
|
| EXPECT_EQ(expected_result,
|
| DatabaseUtil::CrackVfsFileName(ASCIIToUTF16(vfs_file_name),
|
| &origin_identifier,
|
| @@ -28,7 +28,7 @@ static void TestVfsFilePath(bool expected_result,
|
| }
|
|
|
| static GURL ToAndFromOriginIdentifier(const GURL origin_url) {
|
| - string16 id = DatabaseUtil::GetOriginIdentifier(origin_url);
|
| + base::string16 id = DatabaseUtil::GetOriginIdentifier(origin_url);
|
| return DatabaseUtil::GetOriginFromIdentifier(id);
|
| }
|
|
|
|
|