NaCl cleanup: Remove unneeded definition of ResolveFileToken()

components/nacl/loader/nacl_validation_query.cc

 // Copyright 2013 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/nacl/loader/nacl_validation_query.h"
 
 #include "base/logging.h"
 #include "components/nacl/loader/nacl_validation_db.h"
 #include "crypto/nss_util.h"
 #include "native_client/src/include/portability.h"
@@ skipping 13 matching lines @@
   CHECK(nacl_version.length() >= 4);
 }
 
 NaClValidationQuery* NaClValidationQueryContext::CreateQuery() {
   NaClValidationQuery* query = new NaClValidationQuery(db_, profile_key_);
   // Changing the version effectively invalidates existing hashes.
   query->AddData(nacl_version_);
   return query;
 }
 
-bool NaClValidationQueryContext::ResolveFileToken(
-    struct NaClFileToken* file_token,
-    int32* fd,
-    std::string* path) {
-  // This should no longer be used.
-  CHECK(false);
-  return false;
-}
-
 NaClValidationQuery::NaClValidationQuery(NaClValidationDB* db,
                                          const std::string& profile_key)
     : state_(READY),
       hasher_(crypto::HMAC::SHA256),
       db_(db),
       buffer_length_(0) {
   // Without this line on Linux, HMAC::Init will instantiate a singleton that
   // in turn attempts to open a file.  Disabling this behavior avoids a ~70 ms
   // stall the first time HMAC is used.
   // This function is also called in nacl_helper_linux.cc, but nacl_helper may
@@ skipping 78 matching lines @@
 }
 
 static void SetKnownToValidate(void* query) {
   static_cast<NaClValidationQuery*>(query)->SetKnownToValidate();
 }
 
 static void DestroyQuery(void* query) {
   delete static_cast<NaClValidationQuery*>(query);
 }
 
-static int ResolveFileToken(void* handle, struct NaClFileToken* file_token,
-                            int32* fd, char** file_path,
-                            uint32* file_path_length) {
-  std::string path;
-  *file_path = NULL;
-  *file_path_length = 0;
-  bool ok = static_cast<NaClValidationQueryContext*>(handle)->
-      ResolveFileToken(file_token, fd, &path);
-  if (ok) {
-    *file_path = static_cast<char*>(malloc(path.length() + 1));
-    CHECK(*file_path);
-    memcpy(*file_path, path.data(), path.length());
-    (*file_path)[path.length()] = 0;
-    *file_path_length = static_cast<uint32>(path.length());
-  }
-  return ok;
-}
-
 struct NaClValidationCache* CreateValidationCache(
     NaClValidationDB* db, const std::string& profile_key,
     const std::string& nacl_version) {
   NaClValidationCache* cache =
       static_cast<NaClValidationCache*>(malloc(sizeof(NaClValidationCache)));
   // Make sure any fields introduced in a cross-repo change are zeroed.
   memset(cache, 0, sizeof(*cache));
   cache->handle = new NaClValidationQueryContext(db, profile_key, nacl_version);
   cache->CreateQuery = CreateQuery;
   cache->AddData = AddData;
   cache->QueryKnownToValidate = QueryKnownToValidate;
   cache->SetKnownToValidate = SetKnownToValidate;
   cache->DestroyQuery = DestroyQuery;
-  cache->ResolveFileToken = ResolveFileToken;
   return cache;
 }