Revert of Migrates battery_status from content/renderer/ to WebKit/platform/

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

Index: third_party/WebKit/Source/platform/testing/RunAllTests.cpp
diff --git a/third_party/WebKit/Source/platform/testing/RunAllTests.cpp b/third_party/WebKit/Source/platform/testing/RunAllTests.cpp
index 69caa00390fbd3299790d689ec51dd49b77609df..605fbef0ac1e944b1c9f3397ffa0dd1d9103e40f 100644
--- a/third_party/WebKit/Source/platform/testing/RunAllTests.cpp
+++ b/third_party/WebKit/Source/platform/testing/RunAllTests.cpp
@@ -28,9 +28,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "base/test/test_io_thread.h"
-#include "mojo/edk/embedder/embedder.h"
-#include "mojo/edk/test/scoped_ipc_support.h"
 #include "platform/EventTracer.h"
 #include "platform/HTTPNames.h"
 #include "platform/heap/Heap.h"
@@ -46,22 +43,19 @@
 #include <base/test/launcher/unit_test_launcher.h>
 #include <base/test/test_suite.h>
 #include <cc/blink/web_compositor_support_impl.h>
+#include <string.h>
 
-namespace {
-
-double dummyCurrentTime()
+static double dummyCurrentTime()
 {
     return 0.0;
 }
 
-int runTestSuite(base::TestSuite* testSuite)
+static int runTestSuite(base::TestSuite* testSuite)
 {
     int result = testSuite->Run();
     blink::Heap::collectAllGarbage();
     return result;
 }
-
-} // namespace
 
 int main(int argc, char** argv)
 {
@@ -85,12 +79,6 @@
     blink::HTTPNames::init();
 
     base::TestSuite testSuite(argc, argv);
-
-    mojo::edk::Init();
-    base::TestIOThread testIoThread(base::TestIOThread::kAutoStart);
-    WTF::OwnPtr<mojo::edk::test::ScopedIPCSupport> ipcSupport(
-        adoptPtr(new mojo::edk::test::ScopedIPCSupport(testIoThread.task_runner())));
-
     int result = base::LaunchUnitTests(argc, argv, base::Bind(runTestSuite, base::Unretained(&testSuite)));
 
     blink::ThreadState::detachMainThread();