Pepper: PnaclResources cleanup.

ppapi/native_client/src/trusted/plugin/pnacl_resources.h

 // Copyright (c) 2012 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 NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_
 
 #include <map>
 #include <vector>
 
 #include "native_client/src/include/nacl_macros.h"
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/trusted/desc/nacl_desc_wrapper.h"
 
 #include "ppapi/c/private/pp_file_handle.h"
 #include "ppapi/cpp/completion_callback.h"
 
 #include "ppapi/native_client/src/trusted/plugin/plugin_error.h"
 
 namespace plugin {
 
-class Manifest;
 class Plugin;
 class PnaclCoordinator;
 
 // Constants for loading LLC and LD.
 class PnaclUrls {
  public:
-  // Get the base URL prefix for Pnacl resources (without platform prefix).
-  static nacl::string GetBaseUrl();
-
   static bool IsPnaclComponent(const nacl::string& full_url);
   static nacl::string PnaclComponentURLToFilename(
       const nacl::string& full_url);
-
-  // Get the URL for the resource info JSON file that contains information
-  // about loadable resources.
-  static nacl::string GetResourceInfoUrl();
 };
 
 // Loads a list of resources, providing a way to get file descriptors for
 // these resources.  URLs for resources are resolved by the manifest
 // and point to pnacl component filesystem resources.
 class PnaclResources {
  public:
   PnaclResources(Plugin* plugin,
                  PnaclCoordinator* coordinator)
       : plugin_(plugin),
         coordinator_(coordinator),
         llc_file_handle_(PP_kInvalidFileHandle),
         ld_file_handle_(PP_kInvalidFileHandle) {
   }
   virtual ~PnaclResources();
 
   // Read the resource info JSON file.  This is the first step after
   // construction; it has to be completed before StartLoad is called.
   virtual void ReadResourceInfo(
-      const nacl::string& resource_info_url,
       const pp::CompletionCallback& resource_info_read_cb);
 
   // Start loading the resources.
   virtual void StartLoad(
       const pp::CompletionCallback& all_loaded_callback);
 
   const nacl::string& GetLlcUrl() { return llc_tool_name_; }
   const nacl::string& GetLdUrl() { return ld_tool_name_; }
 
   PP_FileHandle TakeLlcFileHandle();
@@ skipping 13 matching lines @@
 
   // File handles for llc and ld executables, after they've been opened.
   // Only valid after the callback for StartLoad() has been called, and until
   // TakeLlcFileHandle()/TakeLdFileHandle() is called.
   PP_FileHandle llc_file_handle_;
   PP_FileHandle ld_file_handle_;
 };
 
 }  // namespace plugin;
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PNACL_RESOURCES_H_