Move the JS content handler et al from mojo/apps/js to mojo/services

services/js/modules/clock/test/run_clock_tests.cc

 // Copyright 2013 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/files/file_path.h"
 #include "base/path_service.h"
 #include "gin/modules/console.h"
 #include "gin/modules/module_registry.h"
 #include "gin/modules/timer.h"
 #include "gin/test/file_runner.h"
 #include "gin/test/gtest.h"
-#include "mojo/apps/js/bindings/monotonic_clock.h"
 #include "mojo/edk/js/core.h"
+#include "mojo/edk/js/threading.h"
+#include "services/js/modules/clock/monotonic_clock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace js {
 namespace {
 
 class TestRunnerDelegate : public gin::FileRunnerDelegate {
  public:
   TestRunnerDelegate() {
     AddBuiltinModule(gin::Console::kModuleName, gin::Console::GetModule);
     AddBuiltinModule(Core::kModuleName, Core::GetModule);
     AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule);
-    AddBuiltinModule(apps::MonotonicClock::kModuleName,
-                     apps::MonotonicClock::GetModule);
+    AddBuiltinModule(MonotonicClock::kModuleName, MonotonicClock::GetModule);
+    AddBuiltinModule(Threading::kModuleName, Threading::GetModule);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestRunnerDelegate);
 };
 
 void RunTest(std::string test, bool run_until_idle) {
   base::FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
-  path = path.AppendASCII("mojo")
-             .AppendASCII("apps")
+  path = path.AppendASCII("services")
              .AppendASCII("js")
-             .AppendASCII("bindings")
+             .AppendASCII("modules")
+             .AppendASCII("clock")
              .AppendASCII(test);
   TestRunnerDelegate delegate;
   gin::RunTestFromFile(path, &delegate, run_until_idle);
 }
 
 // TODO(abarth): Should we autogenerate these stubs from GYP?
 
 TEST(JSTest, monotonic_clock) {
   RunTest("monotonic_clock_unittests.js", false);
 }
 
 }  // namespace
 }  // namespace js
 }  // namespace mojo