Add touch flag to output of Schema::Normalize()

components/policy/core/common/schema_unittest.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/policy/core/common/schema.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "components/policy/core/common/schema_internal.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 110 matching lines @@
 
   // Test that Schema::Validate() works as expected.
   error = kNoErrorReturned;
   bool returned = schema.Validate(value, strategy, NULL, &error);
   EXPECT_EQ(returned, expected_return_value) << error;
 
   // Test that Schema::Normalize() will return the same value as
   // Schema::Validate().
   error = kNoErrorReturned;
   scoped_ptr<base::Value> cloned_value(value.DeepCopy());
-  returned = schema.Normalize(cloned_value.get(), strategy, NULL, &error);
+  bool touched = false;
+  returned =
+      schema.Normalize(cloned_value.get(), strategy, NULL, &error, &touched);
   EXPECT_EQ(returned, expected_return_value) << error;
 
+  bool strictly_valid = schema.Validate(value, SCHEMA_STRICT, NULL, &error);
+  EXPECT_EQ(!strictly_valid && returned, touched);
+
   // Test that Schema::Normalize() have actually dropped invalid and unknown
   // properties.
   if (expected_return_value) {
     EXPECT_TRUE(
         schema.Validate(*cloned_value.get(), SCHEMA_STRICT, NULL, &error));
-    EXPECT_TRUE(
-        schema.Normalize(cloned_value.get(), SCHEMA_STRICT, NULL, &error));
+    EXPECT_TRUE(schema.Normalize(
+        cloned_value.get(), SCHEMA_STRICT, NULL, &error, NULL));
   }
 }
 
 void TestSchemaValidationWithPath(Schema schema,
                                   const base::Value& value,
                                   const std::string& expected_failure_path) {
   std::string error_path = "NOT_SET";
   std::string error;
 
   bool returned = schema.Validate(value, SCHEMA_STRICT, &error_path, &error);
@@ skipping 894 matching lines @@
 
   EXPECT_FALSE(ParseFails(SchemaObjectWrapper(
       "{"
       "  \"type\": \"integer\","
       "  \"minimum\": 10,"
       "  \"maximum\": 20"
       "}")));
 }
 
 }  // namespace policy