Eliminate bundle_size parameter from validator interface.

src/trusted/validator/validation_cache_test.cc

 /*
  * Copyright (c) 2012 The Native Client 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 "gtest/gtest.h"
 
 #include "native_client/src/include/nacl_compiler_annotations.h"
 #include "native_client/src/shared/platform/nacl_log.h"
@@ skipping 87 matching lines @@
   mquery->state = QUERY_DESTROYED;
   mquery->context->query_destroyed = true;
   free(mquery);
 }
 
 class ValidationCachingInterfaceTests : public ::testing::Test {
  protected:
   MockContext context;
   NaClValidationCache cache;
   NaClCPUFeatures cpu_features;
-  int bundle_size;
 
   unsigned char code_buffer[CODE_SIZE];
 
   void SetUp() {
     context.marker = CONTEXT_MARKER;
     context.query_result = 1;
     context.set_validates_expected = false;
     context.query_destroyed = false;
 
     cache.handle = &context;
     cache.CreateQuery = MockCreateQuery;
     cache.AddData = MockAddData;
     cache.QueryKnownToValidate = MockQueryCodeValidates;
     cache.SetKnownToValidate = MockSetCodeValidates;
     cache.DestroyQuery = MockDestroyQuery;
 
     NaClSetAllCPUFeatures(&cpu_features);
 
-    bundle_size = 32;
-
     memset(code_buffer, 0x90, sizeof(code_buffer));
   }
 
   NaClValidationStatus Validate() {
     return NACL_SUBARCH_NAME(ApplyValidator,
                              NACL_TARGET_ARCH,
                              NACL_TARGET_SUBARCH)(
                                  NACL_SB_DEFAULT,
                                  0, code_buffer, 32,
-                                 bundle_size, /* stubout_mode= */ FALSE,
+                                 /* stubout_mode= */ FALSE,
                                  /* readonly_test= */ FALSE, &cpu_features,
                                  &cache);
   }
 };
 
 TEST_F(ValidationCachingInterfaceTests, Sanity) {
   void *query = cache.CreateQuery(cache.handle);
   cache.AddData(query, NULL, 6);
   cache.AddData(query, NULL, 128);
   EXPECT_EQ(1, cache.QueryKnownToValidate(query));
   cache.DestroyQuery(query);
   EXPECT_EQ(true, context.query_destroyed);
 }
 
 TEST_F(ValidationCachingInterfaceTests, NoCache) {
   NaClValidationStatus status =
       NACL_SUBARCH_NAME(ApplyValidator,
                         NACL_TARGET_ARCH,
                         NACL_TARGET_SUBARCH)(
                             NACL_SB_DEFAULT,
                             0, code_buffer, CODE_SIZE,
-                            bundle_size, /* stubout_mode= */ FALSE,
+                            /* stubout_mode= */ FALSE,
                             /* readonly_test= */ FALSE, &cpu_features,
                             NULL);
   EXPECT_EQ(NaClValidationSucceeded, status);
 }
 
 TEST_F(ValidationCachingInterfaceTests, CacheHit) {
   NaClValidationStatus status = Validate();
   EXPECT_EQ(NaClValidationSucceeded, status);
   EXPECT_EQ(true, context.query_destroyed);
 }
@@ skipping 43 matching lines @@
 // Test driver function.
 int main(int argc, char *argv[]) {
   // The IllegalInst test touches the log mutex deep inside the validator.
   // This causes an SEH exception to be thrown on Windows if the mutex is not
   // initialized.
   // http://code.google.com/p/nativeclient/issues/detail?id=1696
   NaClLogModuleInit();
   testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }