NaCl: Simpler validation for main nexe.

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 17 matching lines @@
   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) {
-  return db_->ResolveFileToken(file_token, fd, 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
@@ skipping 114 matching lines @@
   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;
 }