Adding policy support to the new network configuration stack.

chromeos/network/onc/onc_merger_unittest.cc

 // Copyright (c) 2012 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 "chromeos/network/onc/onc_merger.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "chromeos/network/onc/onc_constants.h"
+#include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace chromeos {
 namespace onc {
 namespace {
 
 // Checks that both dictionaries contain an entry at |path| with the same value.
 ::testing::AssertionResult HaveSameValueAt(const base::DictionaryValue& a,
                                            const base::DictionaryValue& b,
@@ skipping 117 matching lines @@
   scoped_ptr<base::DictionaryValue> merged(MergeSettingsAndPoliciesToEffective(
       policy_.get(), device_policy_.get(), user_.get(), NULL));
   EXPECT_TRUE(HaveSameValueAt(*merged, *device_policy_,
                               "VPN.OpenVPN.Username"));
 }
 
 TEST_F(ONCMergerTest, MergeToAugmented) {
   scoped_ptr<base::DictionaryValue> expected_augmented =
       test_utils::ReadTestDictionary("augmented_merge.json");
   scoped_ptr<base::DictionaryValue> merged(MergeSettingsAndPoliciesToAugmented(
-      policy_.get(), device_policy_.get(), user_.get(), NULL));
+      kNetworkConfigurationSignature, policy_.get(), device_policy_.get(),
+      user_.get(), NULL, NULL));
   EXPECT_TRUE(test_utils::Equals(expected_augmented.get(), merged.get()));
 }
 
 }  // namespace merger
 }  // namespace onc
 }  // namespace chromeos