Move mojo/apps/js tests et al to mojo/edk/js/test,tests

mojo/edk/js/tests/js_to_cpp_tests.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/at_exit.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gin/array_buffer.h"
 #include "gin/public/isolate_holder.h"
-#include "mojo/apps/js/mojo_runner_delegate.h"
-#include "mojo/apps/js/test/js_to_cpp.mojom.h"
-#include "mojo/common/common_type_converters.h"
+#include "mojo/edk/js/mojo_runner_delegate.h"
+#include "mojo/edk/js/tests/js_to_cpp.mojom.h"
 #include "mojo/edk/test/test_utils.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace js {
 
 // Global value updated by some checks to prevent compilers from optimizing
 // reads out of existence.
@@ skipping 19 matching lines @@
 const double kExpectedDoubleVal = 3.14159265358979323846;
 const double kExpectedDoubleInf = std::numeric_limits<double>::infinity();
 const double kExpectedDoubleNan = std::numeric_limits<double>::quiet_NaN();
 const float kExpectedFloatVal = static_cast<float>(kExpectedDoubleVal);
 const float kExpectedFloatInf = std::numeric_limits<float>::infinity();
 const float kExpectedFloatNan = std::numeric_limits<float>::quiet_NaN();
 
 // NaN has the property that it is not equal to itself.
 #define EXPECT_NAN(x) EXPECT_NE(x, x)
 
-bool IsRunningOnIsolatedBot() {
-  // TODO(yzshen): Remove this check once isolated tests are supported on the
-  // Chromium waterfall. (http://crbug.com/351214)
-  const base::FilePath test_file_path(
-      test::GetFilePathForJSResource(
-          "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom"));
-  if (!base::PathExists(test_file_path)) {
-    LOG(WARNING) << "Mojom binding files don't exist. Skipping the test.";
-    return true;
-  }
-  return false;
-}
-
 void CheckDataPipe(MojoHandle data_pipe_handle) {
   unsigned char buffer[100];
   uint32_t buffer_size = static_cast<uint32_t>(sizeof(buffer));
   MojoResult result = MojoReadData(
       data_pipe_handle, buffer, &buffer_size, MOJO_READ_DATA_FLAG_NONE);
   EXPECT_EQ(MOJO_RESULT_OK, result);
   EXPECT_EQ(64u, buffer_size);
   for (int i = 0; i < 64; ++i) {
     EXPECT_EQ(i, buffer[i]);
   }
@@ skipping 303 matching lines @@
         MakeProxy<js_to_cpp::JsSide>(pipe.handle0.Pass());
     js_side.set_client(cpp_side);
 
     js_side.internal_state()->router_for_testing()->EnableTestingMode();
 
     cpp_side->set_js_side(js_side.get());
 
     gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode,
                                    gin::ArrayBufferAllocator::SharedInstance());
     gin::IsolateHolder instance;
-    apps::MojoRunnerDelegate delegate;
+    MojoRunnerDelegate delegate;
     gin::ShellRunner runner(&delegate, instance.isolate());
     delegate.Start(&runner, pipe.handle1.release().value(), test);
 
     run_loop_.Run();
   }
 
  private:
   base::ShadowingAtExitManager at_exit_;
   base::MessageLoop loop;
   base::RunLoop run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(JsToCppTest);
 };
 
 TEST_F(JsToCppTest, Ping) {
-  if (IsRunningOnIsolatedBot())
-    return;
-
   PingCppSideConnection cpp_side_connection;
-  RunTest("mojo/apps/js/test/js_to_cpp_unittest", &cpp_side_connection);
+  RunTest("mojo/edk/js/tests/js_to_cpp_tests", &cpp_side_connection);
   EXPECT_TRUE(cpp_side_connection.DidSucceed());
 }
 
 TEST_F(JsToCppTest, Echo) {
-  if (IsRunningOnIsolatedBot())
-    return;
-
   EchoCppSideConnection cpp_side_connection;
-  RunTest("mojo/apps/js/test/js_to_cpp_unittest", &cpp_side_connection);
+  RunTest("mojo/edk/js/tests/js_to_cpp_tests", &cpp_side_connection);
   EXPECT_TRUE(cpp_side_connection.DidSucceed());
 }
 
 TEST_F(JsToCppTest, BitFlip) {
-  if (IsRunningOnIsolatedBot())
-    return;
-
   BitFlipCppSideConnection cpp_side_connection;
-  RunTest("mojo/apps/js/test/js_to_cpp_unittest", &cpp_side_connection);
+  RunTest("mojo/edk/js/tests/js_to_cpp_tests", &cpp_side_connection);
   EXPECT_TRUE(cpp_side_connection.DidSucceed());
 }
 
 TEST_F(JsToCppTest, BackPointer) {
-  if (IsRunningOnIsolatedBot())
-    return;
-
   BackPointerCppSideConnection cpp_side_connection;
-  RunTest("mojo/apps/js/test/js_to_cpp_unittest", &cpp_side_connection);
+  RunTest("mojo/edk/js/tests/js_to_cpp_tests", &cpp_side_connection);
   EXPECT_TRUE(cpp_side_connection.DidSucceed());
 }
 
 }  // namespace js
 }  // namespace mojo