Adding policy support to the new network configuration stack.

chromeos/network/onc/onc_merger_unittest.cc

Index: chromeos/network/onc/onc_merger_unittest.cc
diff --git a/chromeos/network/onc/onc_merger_unittest.cc b/chromeos/network/onc/onc_merger_unittest.cc
index b6187fd7cac4e26b81694041a78a5d837e6b9b8d..f0dbdc578ffc6940892513295a3ad32ffd139641 100644
--- a/chromeos/network/onc/onc_merger_unittest.cc
+++ b/chromeos/network/onc/onc_merger_unittest.cc
@@ -9,6 +9,7 @@
 #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"
 
@@ -146,7 +147,8 @@ 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()));
 }