Mandoline: Merge Surfaces and Views apps

components/html_viewer/html_frame.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 "components/html_viewer/html_frame.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 460 matching lines @@
   frame_tree_manager_->ProcessOnFrameRemoved(this, frame_id);
 }
 
 void HTMLFrame::OnFrameNameChanged(uint32_t frame_id,
                                    const mojo::String& name) {
   frame_tree_manager_->ProcessOnFrameNameChanged(this, frame_id, name);
 }
 
 void HTMLFrame::initializeLayerTreeView() {
   mojo::URLRequestPtr request(mojo::URLRequest::New());
-  request->url = mojo::String::From("mojo:surfaces_service");
+  request->url = mojo::String::From("mojo:view_manager");
   mojo::SurfacePtr surface;
   GetLocalRootApp()->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;
   GetLocalRootApp()->ConnectToService(request2.Pass(), &gpu_service);
   web_layer_tree_view_impl_.reset(new WebLayerTreeViewImpl(
       global_state()->compositor_thread(),
@@ skipping 179 matching lines @@
 
 void HTMLFrame::reload(bool ignore_cache, bool is_client_redirect) {
   NOTIMPLEMENTED();
 }
 
 void HTMLFrame::forwardInputEvent(const blink::WebInputEvent* event) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace mojo