| Index: storage/browser/database/database_util_unittest.cc
|
| diff --git a/content/browser/database_util_unittest.cc b/storage/browser/database/database_util_unittest.cc
|
| similarity index 81%
|
| rename from content/browser/database_util_unittest.cc
|
| rename to storage/browser/database/database_util_unittest.cc
|
| index 9534cb9848808cf95b36061ced250502dbd8c8b4..6aa9f6ee0d56cb6a80fe6ed3b0205507aeb73aec 100644
|
| --- a/content/browser/database_util_unittest.cc
|
| +++ b/storage/browser/database/database_util_unittest.cc
|
| @@ -2,9 +2,9 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "storage/browser/database/database_util.h"
|
| #include "base/strings/string_piece.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "storage/browser/database/database_util.h"
|
| #include "storage/common/database/database_identifier.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -21,8 +21,7 @@ static void TestVfsFilePath(bool expected_result,
|
| base::string16 sqlite_suffix;
|
| EXPECT_EQ(expected_result,
|
| DatabaseUtil::CrackVfsFileName(ASCIIToUTF16(vfs_file_name),
|
| - &origin_identifier,
|
| - &database_name,
|
| + &origin_identifier, &database_name,
|
| &sqlite_suffix));
|
| EXPECT_EQ(expected_origin_identifier, origin_identifier);
|
| EXPECT_EQ(ASCIIToUTF16(expected_database_name), database_name);
|
| @@ -34,12 +33,11 @@ namespace content {
|
| // Test DatabaseUtil::CrackVfsFilePath on various inputs.
|
| TEST(DatabaseUtilTest, CrackVfsFilePathTest) {
|
| TestVfsFilePath(true, "http_origin_0/#", "http_origin_0", "", "");
|
| - TestVfsFilePath(true,
|
| - "http_origin_0/#suffix", "http_origin_0", "", "suffix");
|
| - TestVfsFilePath(true,
|
| - "http_origin_0/db_name#", "http_origin_0", "db_name", "");
|
| - TestVfsFilePath(true,
|
| - "http_origin_0/db_name#suffix", "http_origin_0", "db_name", "suffix");
|
| + TestVfsFilePath(true, "http_origin_0/#suffix", "http_origin_0", "", "suffix");
|
| + TestVfsFilePath(true, "http_origin_0/db_name#", "http_origin_0", "db_name",
|
| + "");
|
| + TestVfsFilePath(true, "http_origin_0/db_name#suffix", "http_origin_0",
|
| + "db_name", "suffix");
|
| TestVfsFilePath(false, "http_origin_0db_name#");
|
| TestVfsFilePath(false, "http_origin_0db_name#suffix");
|
| TestVfsFilePath(false, "http_origin_0/db_name");
|
| @@ -48,5 +46,4 @@ TEST(DatabaseUtilTest, CrackVfsFilePathTest) {
|
| TestVfsFilePath(false, "/db_name#suffix");
|
| }
|
|
|
| -
|
| } // namespace content
|
|
|