Clean up and fix Utils::ToUTF8String() and Utils::ToUTF16String()

src/DefaultFileSystem.cpp

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 33 matching lines @@
     explicit RuntimeErrorWithErrno(const std::string& message)
       : std::runtime_error(message + " (" + strerror(errno) + ")")
     {
     }
   };
 
 #ifdef WIN32
   // Paths need to be converted from UTF-8 to UTF-16 on Windows.
   std::wstring NormalizePath(const std::string& path)
   {
-    return Utils::ToUTF16String(path, path.length());
+    return Utils::ToUTF16String(path);
   }
 
   #define rename _wrename
   #define remove _wremove
 #else
   // POSIX systems: assume that file system encoding is UTF-8 and just use the
   // file paths as they are.
   #define NormalizePath(path) (path)
 #endif
 }
@@ skipping 88 matching lines @@
 
 std::string DefaultFileSystem::Resolve(const std::string& path) const
 {
   if (basePath == "")
   {
     return path;
   }
   else
   {
 #ifdef _WIN32
-  if (PathIsRelative(Utils::ToUTF16String(path, path.length()).c_str()))
+  if (PathIsRelative(NormalizePath(path).c_str()))
 #else
   if (path.length() && *path.begin() != PATH_SEPARATOR)
 #endif
     {
       return basePath + PATH_SEPARATOR + path;
     }
     else
     {
       return path;
     }
   }
 }
 
 void DefaultFileSystem::SetBasePath(const std::string& path)
 {
   basePath = path;
 
   if ((*basePath.rbegin() == PATH_SEPARATOR))
   {
     basePath.resize(basePath.size() - 1);
   }
 }