Use chromium logic for database identifier<->origin conversions

webkit/browser/database/database_util.cc

 // Copyright (c) 2012 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 "webkit/browser/database/database_util.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 #include "webkit/browser/database/database_tracker.h"
 #include "webkit/browser/database/vfs_backend.h"
 
 namespace webkit_database {
 
 const char DatabaseUtil::kJournalFileSuffix[] = "-journal";
 
 bool DatabaseUtil::CrackVfsFileName(const base::string16& vfs_file_name,
                                     std::string* origin_identifier,
                                     base::string16* database_name,
@@ skipping 57 matching lines @@
   char forbidden[] = {'\\', '/', '\0'};
 
   std::string::size_type pos = origin_identifier.find(dotdot);
   if (pos == std::string::npos)
     pos = origin_identifier.find_first_of(forbidden, 0, arraysize(forbidden));
 
   return pos == std::string::npos;
 }
 
 }  // namespace webkit_database