Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Unified Diff: mojo/edk/js/mojo_runner_delegate.cc

Issue 709603002: Move mojo/apps/js tests et al to mojo/edk/js/test,tests (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: chromium environment for JS tests Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/edk/js/mojo_runner_delegate.cc
diff --git a/mojo/apps/js/mojo_runner_delegate.cc b/mojo/edk/js/mojo_runner_delegate.cc
similarity index 85%
rename from mojo/apps/js/mojo_runner_delegate.cc
rename to mojo/edk/js/mojo_runner_delegate.cc
index 078d500b4d07eea4205fe0646d3adf9686ac691c..152b12cf34a36a627136ac7d786659295b5d8aec 100644
--- a/mojo/apps/js/mojo_runner_delegate.cc
+++ b/mojo/edk/js/mojo_runner_delegate.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mojo/apps/js/mojo_runner_delegate.h"
+#include "mojo/edk/js/mojo_runner_delegate.h"
#include "base/bind.h"
#include "base/path_service.h"
@@ -11,15 +11,13 @@
#include "gin/modules/module_registry.h"
#include "gin/modules/timer.h"
#include "gin/try_catch.h"
-#include "mojo/apps/js/bindings/gl/module.h"
-#include "mojo/apps/js/bindings/monotonic_clock.h"
-#include "mojo/apps/js/bindings/threading.h"
#include "mojo/edk/js/core.h"
#include "mojo/edk/js/handle.h"
#include "mojo/edk/js/support.h"
+#include "mojo/edk/js/threading.h"
namespace mojo {
-namespace apps {
+namespace js {
namespace {
@@ -53,9 +51,7 @@ MojoRunnerDelegate::MojoRunnerDelegate()
AddBuiltinModule(gin::TimerModule::kName, gin::TimerModule::GetModule);
AddBuiltinModule(js::Core::kModuleName, js::Core::GetModule);
AddBuiltinModule(js::Support::kModuleName, js::Support::GetModule);
- AddBuiltinModule(js::gl::kModuleName, js::gl::GetModule);
- AddBuiltinModule(MonotonicClock::kModuleName, MonotonicClock::GetModule);
- AddBuiltinModule(Threading::kModuleName, Threading::GetModule);
+ AddBuiltinModule(js::Threading::kModuleName, js::Threading::GetModule);
}
MojoRunnerDelegate::~MojoRunnerDelegate() {
@@ -78,5 +74,5 @@ void MojoRunnerDelegate::UnhandledException(gin::ShellRunner* runner,
LOG(ERROR) << try_catch.GetStackTrace();
}
-} // namespace apps
+} // namespace js
} // namespace mojo

Powered by Google App Engine
This is Rietveld 408576698