Platform WebUnitTestSupport onion soup: remove more indirect methods

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
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
  *
  * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * 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/Platform.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 {
 
 class QuitTask : public WebTaskRunner::Task {
 public:
     virtual void run()
     {
-        Platform::current()->unitTestSupport()->exitRunLoop();
+        exitRunLoop();
     }
 };
 
 void runPendingTasks()
 {
     Platform::current()->currentThread()->taskRunner()->postTask(BLINK_FROM_HERE, new QuitTask);
-    Platform::current()->unitTestSupport()->enterRunLoop();
+    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 file_path = base::FilePath::FromUTF8Unsafe(
+        std::string(utf8.data(), utf8.length()));
+    std::string buffer;
+    base::ReadFileToString(file_path, &buffer);
+    return SharedBuffer::create(buffer.data(), buffer.size());
+}
+
+void enterRunLoop()
+{
+    base::MessageLoop::current()->Run();
+}
+
+void exitRunLoop()
+{
+    base::MessageLoop::current()->QuitWhenIdle();
+}
+
 }
 }