Use explicit WebString <-> string16 conversion methods in storage API files

content/child/webfileutilities_impl.cc

 // Copyright 2014 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 "content/child/webfileutilities_impl.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "content/child/file_info_util.h"
@@ skipping 25 matching lines @@
   if (!base::GetFileInfo(blink::WebStringToFilePath(path),
                          reinterpret_cast<base::File::Info*>(&file_info)))
     return false;
 
   FileInfoToWebFileInfo(file_info, &web_file_info);
   web_file_info.platformPath = path;
   return true;
 }
 
 WebString WebFileUtilitiesImpl::directoryName(const WebString& path) {
-  return blink::WebStringToFilePath(path).DirName().AsUTF16Unsafe();
+  return blink::FilePathToWebString(blink::WebStringToFilePath(path).DirName());
 }
 
 WebString WebFileUtilitiesImpl::baseName(const WebString& path) {
-  return blink::WebStringToFilePath(path).BaseName().AsUTF16Unsafe();
+  return blink::FilePathToWebString(
+      blink::WebStringToFilePath(path).BaseName());
 }
 
 blink::WebURL WebFileUtilitiesImpl::filePathToURL(const WebString& path) {
   return net::FilePathToFileURL(blink::WebStringToFilePath(path));
 }
 
 }  // namespace content