Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / webkit / common / database / database_identifier.cc

diff --git a/src/webkit/common/database/database_identifier.cc b/src/webkit/common/database/database_identifier.cc
index 332dfb8..c4649d2 100644 (file)
--- a/src/webkit/common/database/database_identifier.cc
+++ b/src/webkit/common/database/database_identifier.cc
@@ -39,12 +39,12 @@ DatabaseIdentifier DatabaseIdentifier::CreateFromOrigin(const GURL& origin) {
     return UniqueFileIdentifier();
 
   int port = origin.IntPort();
-  if (port == url_parse::PORT_INVALID)
+  if (port == url::PORT_INVALID)
     return DatabaseIdentifier();
 
   // We encode the default port for the specified scheme as 0. GURL
   // canonicalizes this as an unspecified port.
-  if (port == url_parse::PORT_UNSPECIFIED)
+  if (port == url::PORT_UNSPECIFIED)
     port = 0;
 
   return DatabaseIdentifier(origin.scheme(),
@@ -56,7 +56,7 @@ DatabaseIdentifier DatabaseIdentifier::CreateFromOrigin(const GURL& origin) {
 
 // static
 DatabaseIdentifier DatabaseIdentifier::Parse(const std::string& identifier) {
-  if (!IsStringASCII(identifier))
+  if (!base::IsStringASCII(identifier))
     return DatabaseIdentifier();
 
   size_t first_underscore = identifier.find_first_of('_');