| Index: storage/common/database/database_identifier.cc
|
| diff --git a/webkit/common/database/database_identifier.cc b/storage/common/database/database_identifier.cc
|
| similarity index 92%
|
| rename from webkit/common/database/database_identifier.cc
|
| rename to storage/common/database/database_identifier.cc
|
| index 5bcc4ec6046e3f45eb0fd2d7817cb5b224c87deb..f3f28ba4acd18f90a318bfbeb424f5e763c1c305 100644
|
| --- a/webkit/common/database/database_identifier.cc
|
| +++ b/storage/common/database/database_identifier.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "webkit/common/database/database_identifier.h"
|
| +#include "storage/common/database/database_identifier.h"
|
|
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/string_util.h"
|
| @@ -31,8 +31,8 @@ const DatabaseIdentifier DatabaseIdentifier::UniqueFileIdentifier() {
|
|
|
| // static
|
| DatabaseIdentifier DatabaseIdentifier::CreateFromOrigin(const GURL& origin) {
|
| - if (!origin.is_valid() || origin.is_empty() ||
|
| - !origin.IsStandard() || SchemeIsUnique(origin.scheme()))
|
| + if (!origin.is_valid() || origin.is_empty() || !origin.IsStandard() ||
|
| + SchemeIsUnique(origin.scheme()))
|
| return DatabaseIdentifier();
|
|
|
| if (origin.SchemeIsFile())
|
| @@ -60,9 +60,9 @@ DatabaseIdentifier DatabaseIdentifier::Parse(const std::string& identifier) {
|
| return DatabaseIdentifier();
|
| if (identifier.find("..") != std::string::npos)
|
| return DatabaseIdentifier();
|
| - char forbidden[] = {'\\', '/', ':' ,'\0'};
|
| + char forbidden[] = {'\\', '/', ':', '\0'};
|
| if (identifier.find_first_of(forbidden, 0, arraysize(forbidden)) !=
|
| - std::string::npos) {
|
| + std::string::npos) {
|
| return DatabaseIdentifier();
|
| }
|
|
|
| @@ -105,9 +105,7 @@ DatabaseIdentifier DatabaseIdentifier::Parse(const std::string& identifier) {
|
| }
|
|
|
| DatabaseIdentifier::DatabaseIdentifier()
|
| - : port_(0),
|
| - is_unique_(true),
|
| - is_file_(false) {
|
| + : port_(0), is_unique_(true), is_file_(false) {
|
| }
|
|
|
| DatabaseIdentifier::DatabaseIdentifier(const std::string& scheme,
|
| @@ -122,7 +120,8 @@ DatabaseIdentifier::DatabaseIdentifier(const std::string& scheme,
|
| is_file_(is_file) {
|
| }
|
|
|
| -DatabaseIdentifier::~DatabaseIdentifier() {}
|
| +DatabaseIdentifier::~DatabaseIdentifier() {
|
| +}
|
|
|
| std::string DatabaseIdentifier::ToString() const {
|
| if (is_file_)
|
|
|