Changes html_viewer to get services from appropriate application

components/html_viewer/html_document.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 "components/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 124 matching lines @@
   if (request.extraData())
     return true;
 
   // Otherwise we don't know if we're the right app to handle this request. Ask
   // host to do the navigation for us.
   return false;
 }
 
 }  // namespace
 
-HTMLDocument::HTMLDocument(
-    mojo::InterfaceRequest<mojo::ServiceProvider> services,
-    URLResponsePtr response,
-    mojo::ShellPtr shell,
-    Setup* setup)
-    : app_refcount_(setup->app()->app_lifetime_helper()->CreateAppRefCount()),
+HTMLDocument::HTMLDocument(mojo::ApplicationImpl* html_document_app,
+                           mojo::ApplicationConnection* connection,
+                           URLResponsePtr response,
+                           Setup* setup)
+    : app_refcount_(
+          html_document_app->app_lifetime_helper()->CreateAppRefCount()),
+      html_document_app_(html_document_app),
       response_(response.Pass()),
-      shell_(shell.Pass()),
       web_view_(nullptr),
       root_(nullptr),
-      view_manager_client_factory_(shell_.get(), this),
+      view_manager_client_factory_(html_document_app->shell(), this),
       setup_(setup) {
-  exported_services_.AddService(this);
-  exported_services_.AddService(&view_manager_client_factory_);
-  exported_services_.Bind(services.Pass());
+  connection->AddService(this);
+  connection->AddService(&view_manager_client_factory_);
   if (setup_->did_init())
     Load(response_.Pass());
 }
 
 HTMLDocument::~HTMLDocument() {
   STLDeleteElements(&ax_providers_);
   STLDeleteElements(&ax_provider_requests_);
 
   if (web_view_)
     web_view_->close();
@@ skipping 95 matching lines @@
 void HTMLDocument::initializeLayerTreeView() {
   if (setup_->is_headless()) {
     web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl(
         setup_->compositor_thread(), nullptr, nullptr));
     return;
   }
 
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   request->url = mojo::String::From("mojo:surfaces_service");
   mojo::SurfacePtr surface;
-  setup_->app()->ConnectToService(request.Pass(), &surface);
+  html_document_app_->ConnectToService(request.Pass(), &surface);
 
   // TODO(jamesr): Should be mojo:gpu_service
   mojo::URLRequestPtr request2(mojo::URLRequest::New());
   request2->url = mojo::String::From("mojo:view_manager");
   mojo::GpuPtr gpu_service;
-  setup_->app()->ConnectToService(request2.Pass(), &gpu_service);
+  html_document_app_->ConnectToService(request2.Pass(), &gpu_service);
   web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl(
       setup_->compositor_thread(), surface.Pass(), gpu_service.Pass()));
 }
 
 blink::WebLayerTreeView* HTMLDocument::layerTreeView() {
   return web_layer_tree_view_impl_.get();
 }
 
 blink::WebMediaPlayer* HTMLDocument::createMediaPlayer(
     blink::WebLocalFrame* frame,
     const blink::WebURL& url,
     blink::WebMediaPlayerClient* client,
     blink::WebContentDecryptionModule* initial_cdm) {
-  return setup_->media_factory()->CreateMediaPlayer(frame, url, client,
-                                                    initial_cdm, shell_.get());
+  return setup_->media_factory()->CreateMediaPlayer(
+      frame, url, client, initial_cdm, html_document_app_->shell());
 }
 
 blink::WebFrame* HTMLDocument::createChildFrame(
     blink::WebLocalFrame* parent,
     blink::WebTreeScopeType scope,
     const blink::WebString& frameName,
     blink::WebSandboxFlags sandboxFlags) {
   blink::WebLocalFrame* child_frame = blink::WebLocalFrame::create(scope, this);
   parent->appendChild(child_frame);
   if (EnableOOPIFs()) {
@@ skipping 95 matching lines @@
 void HTMLDocument::OnViewViewportMetricsChanged(
     mojo::View* view,
     const mojo::ViewportMetrics& old_metrics,
     const mojo::ViewportMetrics& new_metrics) {
   InitSetupAndLoadIfNecessary();
 }
 
 void HTMLDocument::OnViewDestroyed(View* view) {
   DCHECK_EQ(view, root_);
   root_ = nullptr;
-  shell_->QuitApplication();
 }
 
 void HTMLDocument::OnViewInputEvent(View* view, const mojo::EventPtr& event) {
   if (event->pointer_data) {
     // Blink expects coordintes to be in DIPs.
     event->pointer_data->x /= setup_->device_pixel_ratio();
     event->pointer_data->y /= setup_->device_pixel_ratio();
     event->pointer_data->screen_x /= setup_->device_pixel_ratio();
     event->pointer_data->screen_y /= setup_->device_pixel_ratio();
   }
 
   if ((event->action == mojo::EVENT_TYPE_POINTER_DOWN ||
        event->action == mojo::EVENT_TYPE_POINTER_UP ||
        event->action == mojo::EVENT_TYPE_POINTER_CANCEL ||
        event->action == mojo::EVENT_TYPE_POINTER_MOVE) &&
       event->pointer_data->kind == mojo::POINTER_KIND_TOUCH) {
     touch_handler_->OnTouchEvent(*event);
     return;
   }
   scoped_ptr<blink::WebInputEvent> web_event =
       event.To<scoped_ptr<blink::WebInputEvent>>();
   if (web_event)
     web_view_->handleInputEvent(*web_event);
 }
 
 }  // namespace html_viewer