platform/testing/{URL|Unit}TestHelpers improvements

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 26 matching lines @@
 #include "public/platform/FilePathConversion.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/text/StringUTF8Adaptor.h"
 
 namespace blink {
 namespace testing {
 
+namespace {
+
+base::FilePath blinkRootFilePath() {
+  base::FilePath path;
+  base::PathService::Get(base::DIR_SOURCE_ROOT, &path);
+  return base::MakeAbsoluteFilePath(
+      path.Append(FILE_PATH_LITERAL("third_party/WebKit")));
+}
+
+}  // namespace
+
 void runPendingTasks() {
   Platform::current()->currentThread()->getWebTaskRunner()->postTask(
       BLINK_FROM_HERE, WTF::bind(&exitRunLoop));
 
   // We forbid GC in the tasks. Otherwise the registered GCTaskObserver tries
   // to run GC with NoHeapPointerOnStack.
   ThreadState::current()->enterGCForbiddenScope();
   enterRunLoop();
   ThreadState::current()->leaveGCForbiddenScope();
 }
 
 void runDelayedTasks(double delayMs) {
   Platform::current()->currentThread()->getWebTaskRunner()->postDelayedTask(
       BLINK_FROM_HERE, WTF::bind(&exitRunLoop), delayMs);
   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) {
-  base::FilePath filePath = blink::WebStringToFilePath(path);
-  std::string buffer;
-  base::ReadFileToString(filePath, &buffer);
-  return SharedBuffer::create(buffer.data(), buffer.size());
-}
-
 void enterRunLoop() {
   base::RunLoop().Run();
 }
 
 void exitRunLoop() {
   base::MessageLoop::current()->QuitWhenIdle();
 }
 
 void yieldCurrentThread() {
   base::PlatformThread::YieldCurrentThread();
 }
 
+String blinkRootDir() {
+  return FilePathToWebString(blinkRootFilePath());
+}
+
+String webTestDataPath(const std::string& relativePath) {
+  return FilePathToWebString(
+      blinkRootFilePath()
+          .Append(FILE_PATH_LITERAL("Source/web/tests/data"))
+          .Append(relativePath));

[Takashi Toyoshima, 2017/01/26 12:48:21]

Hum... this should be AppendASCII() to compile on Windows, or probably taking
"const String& relativePath", and convert it via WebStringToFilePath looks a
right approach.

Let me try changing argument type to const String&. That should not need caller
side changes so much.

+}
+
+String platformTestDataPath(const std::string& relativePath) {
+  return FilePathToWebString(
+      blinkRootFilePath()
+          .Append(FILE_PATH_LITERAL("Source/platform/testing/data"))
+          .Append(relativePath));
+}
+
+PassRefPtr<SharedBuffer> readFromFile(const String& path) {
+  base::FilePath filePath = blink::WebStringToFilePath(path);
+  std::string buffer;
+  base::ReadFileToString(filePath, &buffer);
+  return SharedBuffer::create(buffer.data(), buffer.size());
+}
+
 }  // namespace testing
 }  // namespace blink