Renamed namespaces of url lib and removed namespace aliases.

webkit/common/database/database_identifier.cc

 // Copyright 2013 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/common/database/database_identifier.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "url/url_canon.h"
 
@@ skipping 21 matching lines @@
 // static
 DatabaseIdentifier DatabaseIdentifier::CreateFromOrigin(const GURL& origin) {
   if (!origin.is_valid() || origin.is_empty() ||
       !origin.IsStandard() || SchemeIsUnique(origin.scheme()))
     return DatabaseIdentifier();
 
   if (origin.SchemeIsFile())
     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(),
                             origin.host(),
                             port,
                             false /* unique */,
                             false /* file */);
 }
 
 // static
@@ skipping 71 matching lines @@
   if (is_file_)
     return GURL("file:///");
   if (is_unique_)
     return GURL();
   if (port_ == 0)
     return GURL(scheme_ + "://" + hostname_);
   return GURL(scheme_ + "://" + hostname_ + ":" + base::IntToString(port_));
 }
 
 }  // namespace webkit_database