Change InterfaceFactory<I>::Create() to take a ConnectionContext instead of an ApplicationConnectio…

apps/moterm/moterm_view.cc

 // Copyright 2015 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 "apps/moterm/moterm_view.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
@@ skipping 35 matching lines @@
       input_handler_(GetViewServiceProvider(), this),
       model_(MotermModel::Size(240, 160), MotermModel::Size(24, 80), this),
       force_next_draw_(false),
       ascent_(0),
       line_height_(0),
       advance_width_(0),
       keypad_application_mode_(false) {
   // TODO(vtl): |service_provider_impl_|'s ctor doesn't like an invalid request,
   // so we have to conditionally, explicitly bind.
   if (service_provider_request.is_pending()) {
-    service_provider_impl_.Bind(service_provider_request.Pass());
+    // TODO(vtl): The connection context should probably be plumbed here, which
+    // means that mojo::ui::ViewProviderApp::CreateView() should probably have a
+    // connection context argument.
+    service_provider_impl_.Bind(mojo::ConnectionContext(),
+                                service_provider_request.Pass());
     service_provider_impl_.AddService<mojo::terminal::Terminal>(this);
   }
 
   regular_typeface_ = skia::AdoptRef(SkTypeface::CreateFromStream(
       new SkMemoryStream(font_data::kDejaVuSansMonoRegular.data,
                          font_data::kDejaVuSansMonoRegular.size)));
 
   // TODO(vtl): This duplicates some code.
   SkPaint fg_paint;
   fg_paint.setTypeface(regular_typeface_.get());
@@ skipping 56 matching lines @@
 void MotermView::OnDestroyed() {
   DCHECK(!driver_);
   if (!on_closed_callback_.is_null()) {
     mojo::Closure callback;
     std::swap(callback, on_closed_callback_);
     callback.Run();
   }
 }
 
 void MotermView::Create(
-    mojo::ApplicationConnection* connection,
+    const mojo::ConnectionContext& connection_context,
     mojo::InterfaceRequest<mojo::terminal::Terminal> request) {
   terminal_bindings_.AddBinding(this, request.Pass());
 }
 
 void MotermView::Connect(
     mojo::InterfaceRequest<mojo::files::File> terminal_file,
     bool force,
     const ConnectCallback& callback) {
   if (driver_) {
     // We already have a connection.
@@ skipping 188 matching lines @@
 
 void MotermView::OnKeyPressed(mojo::EventPtr key_event) {
   std::string input_sequence =
       GetInputSequenceForKeyPressedEvent(*key_event, keypad_application_mode_);
   if (input_sequence.empty())
     return;
 
   if (driver_)
     driver_->SendData(input_sequence.data(), input_sequence.size());
 }