Mandoline: Merge Surfaces and Views apps

components/pdf_viewer/pdf_viewer.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/containers/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/view_manager/public/cpp/lib/view_manager_client_impl.h"
 #include "components/view_manager/public/cpp/types.h"
@@ skipping 56 matching lines @@
         local_id_(0u),
         returner_binding_(this) {
   }
   ~BitmapUploader() override {
     MojoGLES2DestroyContext(gles2_context_);
   }
 
   void Init(mojo::Shell* shell) {
     mojo::ServiceProviderPtr surfaces_service_provider;
     mojo::URLRequestPtr request(mojo::URLRequest::New());
-    request->url = mojo::String::From("mojo:surfaces_service");
+    request->url = mojo::String::From("mojo:view_manager");
     shell->ConnectToApplication(request.Pass(),
                                 mojo::GetProxy(&surfaces_service_provider),
                                 nullptr, nullptr);
     ConnectToService(surfaces_service_provider.get(), &surface_);
     surface_->GetIdNamespace(
         base::Bind(&BitmapUploader::SetIdNamespace, base::Unretained(this)));
     mojo::ResourceReturnerPtr returner_ptr;
     returner_binding_.Bind(GetProxy(&returner_ptr));
     surface_->SetResourceReturner(returner_ptr.Pass());
 
@@ skipping 446 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PDFViewer);
 };
 
 }  // namespace
 }  // namespace pdf_viewer
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunner runner(new pdf_viewer::PDFViewer());
   return runner.Run(application_request);
 }