mandoline: Reland "Fix ICU initialization".

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 "base/bind.h"
 #include "base/files/file.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/cpp/connect.h"
@@ skipping 38 matching lines @@
   return loaded_;
 }
 
 base::File ResourceLoader::ReleaseFile(const std::string& path) {
   CHECK(resource_map_.count(path));
   scoped_ptr<base::File> file_wrapper(resource_map_[path].Pass());
   resource_map_.erase(path);
   return file_wrapper->Pass();
 }
 
-base::File ResourceLoader::GetICUFile() {
-  base::File rv;
-  resource_provider_->GetICUHandle(
-      base::Bind(&ResourceLoader::OnGotICU, base::Unretained(this), &rv));
-  resource_provider_.WaitForIncomingResponse();
-  CHECK(rv.IsValid());
-  return rv.Pass();
-}
-
 void ResourceLoader::OnGotResources(const std::vector<std::string>& paths,
                                     mojo::Array<mojo::ScopedHandle> resources) {
 
   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(resources[i].Pass())));
   }
   loaded_ = true;
 }
 
-void ResourceLoader::OnGotICU(base::File* file, mojo::ScopedHandle handle) {
-  *file = GetFileFromHandle(handle.Pass());
-}
-
 }  // namespace resource_provider