Cleanup sandbox/ in advance of re-enabling some MSVC warnings.

sandbox/win/src/policy_opcodes_unittest.cc

 // Copyright (c) 2006-2008 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 "sandbox/win/src/sandbox_types.h"
 #include "sandbox/win/src/sandbox_nt_types.h"
 #include "sandbox/win/src/policy_engine_params.h"
 #include "sandbox/win/src/policy_engine_opcodes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 271 matching lines @@
   EXPECT_EQ(24, mc1.position);
 
   // Test that we don't match because it is not at the end of the string
   PolicyOpcode* op5b = opcode_maker.MakeOpWStringMatch(0, txt5, kSeekToEnd,
                                                        CASE_SENSITIVE,
                                                        kPolNone);
   EXPECT_EQ(EVAL_FALSE, op5b->Evaluate(&pp_tc1, 1, &mc1));
 
   // Test that we function if the string does not fit. In this case we
   // try to match 'the lazy dog' against 'he lazy dog'.
-  PolicyOpcode* op6 = opcode_maker.MakeOpWStringMatch(0, txt4, 2,
+  // !!! Are we supposed to Evaluate() this opcode and test the result?

[Peter Kasting, 2014/09/29 23:09:25]

This question needs answering before this CL can be committed.

[cpu_(ooo_6.6-7.5), 2014/09/30 17:57:26]

Yes, looks like somebody forgot to call evaluate() and check the result.

I assume line 295 will move above, to 289

[Peter Kasting, 2014/10/01 02:32:13]

Fixed.
Sure, assuming we intend to test that if Evaluate() fails, it won't change the
provided value.  I added a few other such checks in here as well.

+  /*PolicyOpcode* op6 =*/ opcode_maker.MakeOpWStringMatch(0, txt4, 2,
                                                       CASE_SENSITIVE, kPolNone);
   EXPECT_EQ(24, mc1.position);
 
   // Testing matching against 'g' which should be the last char.
   MatchContext mc2;
   PolicyOpcode* op7 = opcode_maker.MakeOpWStringMatch(0, txt6, kSeekForward,
                                                       CASE_SENSITIVE, kPolNone);
   EXPECT_EQ(EVAL_TRUE, op7->Evaluate(&pp_tc1, 1, &mc2));
 
   // Trying to match again should fail since we are in the last char.
@@ skipping 31 matching lines @@
   MatchContext mc1;
   void* dummy = NULL;
   ParameterSet ppb1 = ParamPickerMake(dummy);
 
   PolicyOpcode* op1 = opcode_maker.MakeOpAction(ASK_BROKER, kPolNone);
   EXPECT_TRUE(op1->IsAction());
   EXPECT_EQ(ASK_BROKER, op1->Evaluate(&ppb1, 1, &mc1));
 }
 
 }  // namespace sandbox