Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / url / url_canon_stdstring.h

diff --git a/src/url/url_canon_stdstring.h b/src/url/url_canon_stdstring.h
index 0915672..e859fe2 100644 (file)
--- a/src/url/url_canon_stdstring.h
+++ b/src/url/url_canon_stdstring.h
@@ -15,7 +15,7 @@
 #include "url/url_canon.h"
 #include "url/url_export.h"
 
-namespace url_canon {
+namespace url {
 
 // Write into a std::string given in the constructor. This object does not own
 // the string itself, and the user must ensure that the string stays alive
@@ -53,43 +53,34 @@ class URL_EXPORT StdStringCanonOutput : public CanonOutput {
 // The strings passed as arguments are not copied and must remain valid until
 // this class goes out of scope.
 template<typename STR>
-class StdStringReplacements :
-    public url_canon::Replacements<typename STR::value_type> {
+class StdStringReplacements : public Replacements<typename STR::value_type> {
  public:
   void SetSchemeStr(const STR& s) {
-    this->SetScheme(s.data(),
-                    url_parse::Component(0, static_cast<int>(s.length())));
+    this->SetScheme(s.data(), Component(0, static_cast<int>(s.length())));
   }
   void SetUsernameStr(const STR& s) {
-    this->SetUsername(s.data(),
-                      url_parse::Component(0, static_cast<int>(s.length())));
+    this->SetUsername(s.data(), Component(0, static_cast<int>(s.length())));
   }
   void SetPasswordStr(const STR& s) {
-    this->SetPassword(s.data(),
-                      url_parse::Component(0, static_cast<int>(s.length())));
+    this->SetPassword(s.data(), Component(0, static_cast<int>(s.length())));
   }
   void SetHostStr(const STR& s) {
-    this->SetHost(s.data(),
-                  url_parse::Component(0, static_cast<int>(s.length())));
+    this->SetHost(s.data(), Component(0, static_cast<int>(s.length())));
   }
   void SetPortStr(const STR& s) {
-    this->SetPort(s.data(),
-                  url_parse::Component(0, static_cast<int>(s.length())));
+    this->SetPort(s.data(), Component(0, static_cast<int>(s.length())));
   }
   void SetPathStr(const STR& s) {
-    this->SetPath(s.data(),
-                  url_parse::Component(0, static_cast<int>(s.length())));
+    this->SetPath(s.data(), Component(0, static_cast<int>(s.length())));
   }
   void SetQueryStr(const STR& s) {
-    this->SetQuery(s.data(),
-                   url_parse::Component(0, static_cast<int>(s.length())));
+    this->SetQuery(s.data(), Component(0, static_cast<int>(s.length())));
   }
   void SetRefStr(const STR& s) {
-    this->SetRef(s.data(),
-                 url_parse::Component(0, static_cast<int>(s.length())));
+    this->SetRef(s.data(), Component(0, static_cast<int>(s.length())));
   }
 };
 
-}  // namespace url_canon
+}  // namespace url
 
 #endif  // URL_URL_CANON_STDSTRING_H_