Mojo JS bindings: simplify mojo.connectToService() usage - Part 2

mojo/apps/js/js_app.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 "mojo/apps/js/js_app.h"
 
 #include "base/bind.h"
 #include "gin/array_buffer.h"
 #include "gin/converter.h"
 #include "mojo/apps/js/application_delegate_impl.h"
-#include "mojo/apps/js/mojo_module.h"
+#include "mojo/apps/js/mojo_bridge_module.h"
 
 namespace mojo {
 namespace apps {
 
 JSApp::JSApp(ApplicationDelegateImpl* app_delegate_impl)
     : app_delegate_impl_(app_delegate_impl),
       thread_("Mojo JS"),
       app_delegate_impl_task_runner_(
           base::MessageLoop::current()->task_runner()) {
   CHECK(on_app_delegate_impl_thread());
-  runner_delegate_.AddBuiltinModule(Mojo::kModuleName,
-                                    base::Bind(Mojo::GetModule, this));
+  runner_delegate_.AddBuiltinModule(MojoInternals::kModuleName,
+                                    base::Bind(MojoInternals::GetModule, this));
 }
 
 JSApp::~JSApp() {
 }
 
 bool JSApp::Start() {
   CHECK(!js_app_task_runner_.get() && on_app_delegate_impl_thread());
   base::Thread::Options thread_options(base::MessageLoop::TYPE_IO, 0);
   thread_.StartWithOptions(thread_options);
 
@@ skipping 69 matching lines @@
 }
 
 bool JSApp::on_js_app_thread() const {
   return js_app_task_runner_.get() &&
          js_app_task_runner_.get() ==
              base::MessageLoop::current()->task_runner().get();
 }
 
 }  // namespace apps
 }  // namespace mojo