Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead.

components/bitmap_uploader/bitmap_uploader.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/bitmap_uploader/bitmap_uploader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_surface.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_utils.h"
 #include "mojo/public/c/gles2/chromium_extension.h"
 #include "mojo/public/c/gles2/gles2.h"
-#include "mojo/services/network/public/interfaces/url_loader.mojom.h"
-#include "mojo/shell/public/cpp/application_impl.h"
-#include "mojo/shell/public/cpp/connect.h"
-#include "mojo/shell/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/cpp/shell.h"
 
 namespace bitmap_uploader {
 namespace {
 
 const uint32_t g_transparent_color = 0x00000000;
 
 void LostContext(void*) {
   // TODO(fsamuel): Figure out if there's something useful to do here.
 }
 
-void OnGotRemoteIDs(uint32_t remote_id, uint32_t content_handler_id) {}
-
 }  // namespace
 
 const char kBitmapUploaderForAcceleratedWidget[] =
     "__BITMAP_UPLOADER_ACCELERATED_WIDGET__";
 
 BitmapUploader::BitmapUploader(mus::Window* window)
     : window_(window),
       color_(g_transparent_color),
       width_(0),
       height_(0),
       format_(BGRA),
       next_resource_id_(1u),
       id_namespace_(0u),
       surface_client_binding_(this) {}
 
 BitmapUploader::~BitmapUploader() {
   MojoGLES2DestroyContext(gles2_context_);
 }
 
-void BitmapUploader::Init(mojo::shell::mojom::Shell* shell) {
+void BitmapUploader::Init(mojo::Shell* shell) {
   surface_ = window_->RequestSurface(mus::mojom::SurfaceType::DEFAULT);
   surface_->BindToThread();
 
-  mojo::ServiceProviderPtr gpu_service_provider;
-  mojo::URLRequestPtr request2(mojo::URLRequest::New());
-  request2->url = mojo::String::From("mojo:mus");
-  shell->ConnectToApplication(std::move(request2),
-                              mojo::GetProxy(&gpu_service_provider), nullptr,
-                              mojo::CreatePermissiveCapabilityFilter(),
-                              base::Bind(&OnGotRemoteIDs));
-  ConnectToService(gpu_service_provider.get(), &gpu_service_);
-
+  shell->ConnectToService("mojo:mus", &gpu_service_);
   mus::mojom::CommandBufferPtr gles2_client;
   gpu_service_->CreateOffscreenGLES2Context(GetProxy(&gles2_client));
   gles2_context_ = MojoGLES2CreateContext(
       gles2_client.PassInterface().PassHandle().release().value(),
       nullptr,
       &LostContext, nullptr, mojo::Environment::GetDefaultAsyncWaiter());
   MojoGLES2MakeCurrent(gles2_context_);
 }
 
 // Sets the color which is RGBA.
@@ skipping 185 matching lines @@
     glWaitSyncTokenCHROMIUM(
         resource->sync_token.To<gpu::SyncToken>().GetConstData());
     uint32_t texture_id = resource_to_texture_id_map_[resource->id];
     DCHECK_NE(0u, texture_id);
     resource_to_texture_id_map_.erase(resource->id);
     glDeleteTextures(1, &texture_id);
   }
 }
 
 }  // namespace bitmap_uploader