Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / xwalk / runtime / browser / runtime_file_select_helper.cc

diff --git a/src/xwalk/runtime/browser/runtime_file_select_helper.cc b/src/xwalk/runtime/browser/runtime_file_select_helper.cc
index dc0d4d5..176388e 100644 (file)
--- a/src/xwalk/runtime/browser/runtime_file_select_helper.cc
+++ b/src/xwalk/runtime/browser/runtime_file_select_helper.cc
@@ -9,7 +9,7 @@
 
 #include "base/bind.h"
 #include "base/file_util.h"
-#include "base/platform_file.h"
+#include "base/files/file.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ -251,7 +251,7 @@ RuntimeFileSelectHelper::GetFileTypesFromAcceptType(
   int valid_type_count = 0;
   int description_id = 0;
   for (size_t i = 0; i < accept_types.size(); ++i) {
-    std::string ascii_type = UTF16ToASCII(accept_types[i]);
+    std::string ascii_type = base::UTF16ToASCII(accept_types[i]);
     if (!IsAcceptTypeValid(ascii_type))
       continue;
 
@@ -487,7 +487,7 @@ bool RuntimeFileSelectHelper::IsAcceptTypeValid(
   // of an extension or a "/" in the case of a MIME type).
   std::string unused;
   if (accept_type.length() <= 1 ||
-      StringToLowerASCII(accept_type) != accept_type ||
+      base::StringToLowerASCII(accept_type) != accept_type ||
       base::TrimWhitespaceASCII(
         accept_type,
         base::TRIM_ALL, &unused) != base::TRIM_NONE) {