Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(413)

Unified Diff: components/nacl/loader/nacl_validation_query.cc

Issue 897353002: NaCl cleanup: Remove unneeded definition of ResolveFileToken() (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/nacl/loader/nacl_validation_query.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/nacl/loader/nacl_validation_query.cc
diff --git a/components/nacl/loader/nacl_validation_query.cc b/components/nacl/loader/nacl_validation_query.cc
index 0a3582e9dd9147e6c57bef23582b39c32d9dd683..b79278c38e98f8d6074957469aa9606e7a6597dd 100644
--- a/components/nacl/loader/nacl_validation_query.cc
+++ b/components/nacl/loader/nacl_validation_query.cc
@@ -31,15 +31,6 @@ NaClValidationQuery* NaClValidationQueryContext::CreateQuery() {
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),
@@ -138,24 +129,6 @@ 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) {
@@ -169,6 +142,5 @@ struct NaClValidationCache* CreateValidationCache(
cache->QueryKnownToValidate = QueryKnownToValidate;
cache->SetKnownToValidate = SetKnownToValidate;
cache->DestroyQuery = DestroyQuery;
- cache->ResolveFileToken = ResolveFileToken;
return cache;
}
« no previous file with comments | « components/nacl/loader/nacl_validation_query.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698