Revert of mandoline: Fix ICU initialization.

components/resource_provider/public/cpp/resource_loader.h

 // 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.
 
 #ifndef COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_
 #define COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 28 matching lines @@
 
   // Uses WaitForIncomingMessage() to block until the results are available, or
   // an error occurs. Returns true if the resources were obtained, false on
   // error. This immediately returns if the resources have already been
   // obtained.
   bool BlockUntilLoaded();
 
   // Releases and returns the file wrapping the handle.
   base::File ReleaseFile(const std::string& path);
 
+  base::File GetICUFile();
+
   bool loaded() const { return loaded_; }
 
  private:
   using ResourceMap = std::map<std::string, scoped_ptr<base::File>>;
 
   // Callback when resources have loaded.
   void OnGotResources(const std::vector<std::string>& paths,
                       mojo::Array<mojo::ScopedHandle> resources);
+  void OnGotICU(base::File* file, mojo::ScopedHandle handle);
 
   ResourceProviderPtr resource_provider_;
 
   ResourceMap resource_map_;
 
   bool loaded_;
   bool did_block_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
 };
 
 }  // namespace resource_provider
 
 #endif  // COMPONENTS_RESOURCE_PROVIDER_PUBLIC_CPP_RESOURCE_LOADER_H_