2 files changed, 1 insertions, 13 deletions
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc b/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
index c1da398..6ba90c8 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_resources.cc
@@ -21,9 +21,6 @@ namespace plugin {
 static const char kPnaclComponentScheme[] = "pnacl-component://";
 const char PnaclUrls::kResourceInfoUrl[] = "pnacl.json";
 
-const char PnaclResources::kDefaultLlcName[] = "llc.nexe";
-const char PnaclResources::kDefaultLdName[] = "ld.nexe";
-
 nacl::string PnaclUrls::GetBaseUrl() {
   return nacl::string(kPnaclComponentScheme);
 }
diff --git a/ppapi/native_client/src/trusted/plugin/pnacl_resources.h b/ppapi/native_client/src/trusted/plugin/pnacl_resources.h
index e5f36ab..f514b68 100644
--- a/ppapi/native_client/src/trusted/plugin/pnacl_resources.h
+++ b/ppapi/native_client/src/trusted/plugin/pnacl_resources.h
@@ -56,9 +56,7 @@ class PnaclResources {
                  const Manifest* manifest)
       : plugin_(plugin),
         coordinator_(coordinator),
-        manifest_(manifest),
-        llc_tool_name(kDefaultLlcName),
-        ld_tool_name(kDefaultLdName) {
+        manifest_(manifest) {
   }
   virtual ~PnaclResources();
 
@@ -99,13 +97,6 @@ class PnaclResources {
   // once all_loaded_callback_ has been invoked.
   std::map<nacl::string, nacl::DescWrapper*> resource_wrappers_;
 
-  // The names of the llc and ld nexes are read from the resource info file.
-  // These are default values if the resource file does not contain the names.
-  // TODO(eliben): this should be eventually removed, once all nacl deps
-  // propagate - the names should always exist in the resource info JSON file.
-  static const char kDefaultLlcName[];
-  static const char kDefaultLdName[];
-
   // Tool names for llc and ld; read from the resource info file.
   nacl::string llc_tool_name;
   nacl::string ld_tool_name;