Move shell interfaces into the shell.mojom namespace.

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"
@@ skipping 33 matching lines @@
       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* shell) {
+void BitmapUploader::Init(mojo::shell::mojom::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));
@@ skipping 197 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