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

components/resource_provider/public/cpp/resource_loader.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/resource_provider/public/cpp/resource_loader.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/files/file.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/platform_handle/platform_handle_functions.h"
-#include "mojo/shell/public/cpp/application_impl.h"
-#include "mojo/shell/public/cpp/connect.h"
+#include "mojo/shell/public/cpp/shell.h"
 #include "mojo/shell/public/interfaces/service_provider.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 
 namespace resource_provider {
 namespace {
 base::File GetFileFromHandle(mojo::ScopedHandle handle) {
   CHECK(handle.is_valid());
   MojoPlatformHandle platform_handle;
   CHECK(MojoExtractPlatformHandle(handle.release().value(),
                                   &platform_handle) == MOJO_RESULT_OK);
   return base::File(platform_handle);
 }
 }
 
-ResourceLoader::ResourceLoader(mojo::ApplicationImpl* app,
+ResourceLoader::ResourceLoader(mojo::Shell* shell,
                                const std::set<std::string>& paths)
     : loaded_(false), did_block_(false) {
-  app->ConnectToService("mojo:resource_provider", &resource_provider_);
+  shell->ConnectToService("mojo:resource_provider", &resource_provider_);
   std::vector<std::string> paths_vector(paths.begin(), paths.end());
   resource_provider_->GetResources(
       mojo::Array<mojo::String>::From(paths_vector),
       base::Bind(&ResourceLoader::OnGotResources, base::Unretained(this),
                  paths_vector));
 }
 
 ResourceLoader::~ResourceLoader() {
 }
 
@@ skipping 19 matching lines @@
   CHECK(!resources.is_null());
   CHECK_EQ(resources.size(), paths.size());
   for (size_t i = 0; i < resources.size(); ++i) {
     resource_map_[paths[i]].reset(
         new base::File(GetFileFromHandle(std::move(resources[i]))));
   }
   loaded_ = true;
 }
 
 }  // namespace resource_provider