Merge 183141

webkit/database/database_util_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/database/database_util.h"
 
 using webkit_database::DatabaseUtil;
 
 static void TestVfsFilePath(bool expected_result,
                             const char* vfs_file_name,
                             const char* expected_origin_identifier = "",
                             const char* expected_database_name = "",
                             const char* expected_sqlite_suffix = "") {
   string16 origin_identifier;
   string16 database_name;
   string16 sqlite_suffix;
   EXPECT_EQ(expected_result,
             DatabaseUtil::CrackVfsFileName(ASCIIToUTF16(vfs_file_name),
                                            &origin_identifier,
                                            &database_name,
                                            &sqlite_suffix));
   EXPECT_EQ(ASCIIToUTF16(expected_origin_identifier), origin_identifier);
   EXPECT_EQ(ASCIIToUTF16(expected_database_name), database_name);
   EXPECT_EQ(ASCIIToUTF16(expected_sqlite_suffix), sqlite_suffix);
 }
 
 static GURL ToAndFromOriginIdentifier(const GURL origin_url) {
   string16 id = DatabaseUtil::GetOriginIdentifier(origin_url);
   return DatabaseUtil::GetOriginFromIdentifier(id);
 }
 
+static void TestValidOriginIdentifier(bool expected_result,
+                                      const base::StringPiece id) {
+  EXPECT_EQ(expected_result,
+            DatabaseUtil::IsValidOriginIdentifier(ASCIIToUTF16(id)));
+}
+
 namespace webkit_database {
 
 // 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(false, "/db_name#");
   TestVfsFilePath(false, "/db_name#suffix");
 }
 
 TEST(DatabaseUtilTest, OriginIdentifiers) {
   const GURL kFileOrigin(GURL("file:///").GetOrigin());
   const GURL kHttpOrigin(GURL("http://bar/").GetOrigin());
   EXPECT_EQ(kFileOrigin, ToAndFromOriginIdentifier(kFileOrigin));
   EXPECT_EQ(kHttpOrigin, ToAndFromOriginIdentifier(kHttpOrigin));
 }
 
+TEST(DatabaseUtilTest, IsValidOriginIdentifier) {
+  TestValidOriginIdentifier(true,  "http_bar_0");
+  TestValidOriginIdentifier(true,  "");
+  TestValidOriginIdentifier(false, "bad..id");
+  TestValidOriginIdentifier(false, "bad/id");
+  TestValidOriginIdentifier(false, "bad\\id");
+  TestValidOriginIdentifier(false, base::StringPiece("bad\0id", 6));
+}
+
 }  // namespace webkit_database