Look closer at the components of vfsfilenames that are used filenames.

BUG=352447
TBR=sky

Review URL: https://codereview.chromium.org/199153003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276348 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 9 deletions

diff --git a/content/browser/database_util_unittest.cc b/content/browser/database_util_unittest.cc
index 4b11a18..23f0a47 100644
--- a/content/browser/database_util_unittest.cc
+++ b/content/browser/database_util_unittest.cc
@@ -44,14 +44,17 @@ namespace content {
 
 // Test DatabaseUtil::CrackVfsFilePath on various inputs.
 TEST(DatabaseUtilTest, CrackVfsFilePathTest) {
-  TestVfsFilePath(true, "origin/#", "origin", "", "");
-  TestVfsFilePath(true, "origin/#suffix", "origin", "", "suffix");
-  TestVfsFilePath(true, "origin/db_name#", "origin", "db_name", "");
-  TestVfsFilePath(true, "origin/db_name#suffix", "origin", "db_name", "suffix");
-  TestVfsFilePath(false, "origindb_name#");
-  TestVfsFilePath(false, "origindb_name#suffix");
-  TestVfsFilePath(false, "origin/db_name");
-  TestVfsFilePath(false, "origin#db_name/suffix");
+  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(false, "http_origin_0db_name#");
+  TestVfsFilePath(false, "http_origin_0db_name#suffix");
+  TestVfsFilePath(false, "http_origin_0/db_name");
+  TestVfsFilePath(false, "http_origin_0#db_name/suffix");
   TestVfsFilePath(false, "/db_name#");
   TestVfsFilePath(false, "/db_name#suffix");
 }
@@ -65,10 +68,11 @@ TEST(DatabaseUtilTest, OriginIdentifiers) {
 
 TEST(DatabaseUtilTest, IsValidOriginIdentifier) {
   TestValidOriginIdentifier(true,  "http_bar_0");
-  TestValidOriginIdentifier(true,  "");
+  TestValidOriginIdentifier(false,  "");
   TestValidOriginIdentifier(false, "bad..id");
   TestValidOriginIdentifier(false, "bad/id");
   TestValidOriginIdentifier(false, "bad\\id");
+  TestValidOriginIdentifier(false, "http_bad:0_2");
   TestValidOriginIdentifier(false, std::string("bad\0id", 6));
 }