Makes ResourceLoader own handles and return Files

components/resource_provider/resource_provider_apptest.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 <stdint.h>
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/files/file.h"
 #include "base/run_loop.h"
 #include "components/resource_provider/public/cpp/resource_loader.h"
@@ skipping 40 matching lines @@
 
  protected:
   using ResourceContentsMap = std::map<std::string, std::string>;
 
   // Queries ResourceProvider for the specified resources, blocking until the
   // resources are returned. The return map maps from the path to the contents
   // of the file at the specified path.
   ResourceContentsMap GetResources(const std::set<std::string>& paths) {
     ResourceLoader loader(application_impl()->shell(), paths);
     loader.BlockUntilLoaded();
-    const ResourceLoader::ResourceMap& resource_loader_results(
-        loader.resource_map());
 
     // Load the contents of each of the handles.
     ResourceContentsMap results;
-    for (auto& pair : resource_loader_results) {
-      base::File file(pair.second);
-      results[pair.first] = ReadFile(&file);
+    for (auto& path : paths) {
+      base::File file(loader.ReleaseFile(path));
+      results[path] = ReadFile(&file);
     }
     return results;
   }
 
   // ApplicationTestBase:
   void SetUp() override {
     ApplicationTestBase::SetUp();
   }
 
  private:
@@ skipping 11 matching lines @@
       GetResources(SetWithStrings("sample", "dir/sample2")));
   ASSERT_TRUE(results.count("sample") > 0u);
   EXPECT_EQ("test data\n", results["sample"]);
 
   ASSERT_TRUE(results.count("dir/sample2") > 0u);
   EXPECT_EQ("xxyy\n", results["dir/sample2"]);
 }
 
 }  // namespace
 }  // namespace resource_provider