Add utility method for WebString to base::FilePath conversion

third_party/WebKit/Source/platform/testing/UnitTestHelpers.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 12 matching lines @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/testing/UnitTestHelpers.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "platform/SharedBuffer.h"
+#include "public/platform/FilePathConversion.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebString.h"
 #include "public/platform/WebTaskRunner.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "public/platform/WebUnitTestSupport.h"
 #include "wtf/text/StringUTF8Adaptor.h"
 
 namespace blink {
 namespace testing {
 
 void runPendingTasks()
 {
     Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, bind(&exitRunLoop));
     enterRunLoop();
 }
 
 String blinkRootDir()
 {
     base::FilePath path;
     base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
     path = path.Append(FILE_PATH_LITERAL("third_party/WebKit"));
     path = base::MakeAbsoluteFilePath(path);
     return String::fromUTF8(path.MaybeAsASCII().c_str());
 }
 
 PassRefPtr<SharedBuffer> readFromFile(const String& path)
 {
-    StringUTF8Adaptor utf8(path);
-    base::FilePath filePath = base::FilePath::FromUTF8Unsafe(
-        std::string(utf8.data(), utf8.length()));
+    base::FilePath filePath = blink::WebStringToFilePath(path);
     std::string buffer;
     base::ReadFileToString(filePath, &buffer);
     return SharedBuffer::create(buffer.data(), buffer.size());
 }
 
 void enterRunLoop()
 {
     base::MessageLoop::current()->Run();
 }
 
 void exitRunLoop()
 {
     base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void yieldCurrentThread()
 {
     base::PlatformThread::YieldCurrentThread();
 }
 
 } // namespace testing
 } // namespace blink