This moves the ONC parsing code into chromeos/network/onc

chrome/browser/chromeos/network_settings/onc_merger_unittest.cc

Index: chrome/browser/chromeos/network_settings/onc_merger_unittest.cc
diff --git a/chrome/browser/chromeos/network_settings/onc_merger_unittest.cc b/chrome/browser/chromeos/network_settings/onc_merger_unittest.cc
deleted file mode 100644
index 76b453217308ecd85be23520dd617faa9305b265..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/network_settings/onc_merger_unittest.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-// 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 "chrome/browser/chromeos/network_settings/onc_merger.h"
-
-#include <string>
-
-#include "base/logging.h"
-#include "base/values.h"
-#include "chrome/browser/chromeos/cros/onc_constants.h"
-#include "chrome/browser/chromeos/network_settings/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,
-                                           const std::string& path) {
-  const base::Value* a_value = NULL;
-  if (!a.Get(path, &a_value)) {
-    return ::testing::AssertionFailure()
-        << "First dictionary '" << a << "' doesn't contain " << path;
-  }
-
-  const base::Value* b_value = NULL;
-  if (!b.Get(path, &b_value)) {
-    return ::testing::AssertionFailure()
-        << "Second dictionary '" << b << "' doesn't contain " << path;
-  }
-
-  if (base::Value::Equals(a_value, b_value)) {
-    return ::testing::AssertionSuccess()
-        << "Entries at '" << path << "' are equal";
-  } else {
-    return ::testing::AssertionFailure()
-        << "Entries at '" << path << "' not equal but are '"
-        << *a_value << "' and '" << *b_value << "'";
-  }
-}
-
-}  // namespace
-
-namespace merger {
-
-class ONCMergerTest : public testing::Test {
- public:
-  scoped_ptr<const base::DictionaryValue> user_;
-  scoped_ptr<const base::DictionaryValue> policy_;
-  scoped_ptr<const base::DictionaryValue> policy_without_recommended_;
-  scoped_ptr<const base::DictionaryValue> device_policy_;
-
-  virtual void SetUp() {
-    policy_ = test_utils::ReadTestDictionary("policy.onc");
-    policy_without_recommended_ =
-        test_utils::ReadTestDictionary("policy_without_recommended.onc");
-    user_ = test_utils::ReadTestDictionary("user.onc");
-    device_policy_ = test_utils::ReadTestDictionary("device_policy.onc");
-  }
-};
-
-TEST_F(ONCMergerTest, MandatoryValueOverwritesUserValue) {
-  scoped_ptr<base::DictionaryValue> merged(
-      MergeSettingsWithPolicies(policy_.get(), NULL, user_.get(), NULL));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "Type"));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "IPConfigs"));
-}
-
-TEST_F(ONCMergerTest, MandatoryValueAndNoUserValue) {
-  scoped_ptr<base::DictionaryValue> merged(
-      MergeSettingsWithPolicies(policy_.get(), NULL, user_.get(), NULL));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "GUID"));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "VPN.OpenVPN.Username"));
-}
-
-TEST_F(ONCMergerTest, MandatoryDictionaryAndNoUserValue) {
-  scoped_ptr<base::DictionaryValue> merged(
-      MergeSettingsWithPolicies(policy_.get(), NULL, user_.get(), NULL));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *policy_without_recommended_,
-                              "VPN.OpenVPN.ClientCertPattern"));
-}
-
-TEST_F(ONCMergerTest, UserValueOverwritesRecommendedValue) {
-  scoped_ptr<base::DictionaryValue> merged(
-      MergeSettingsWithPolicies(policy_.get(), NULL, user_.get(), NULL));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *user_, "VPN.Host"));
-}
-
-TEST_F(ONCMergerTest, UserValueAndRecommendedUnset) {
-  scoped_ptr<base::DictionaryValue> merged(
-      MergeSettingsWithPolicies(policy_.get(), NULL, user_.get(), NULL));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *user_, "VPN.OpenVPN.Password"));
-}
-
-TEST_F(ONCMergerTest, UserDictionaryAndNoPolicyValue) {
-  scoped_ptr<base::DictionaryValue> merged(
-      MergeSettingsWithPolicies(policy_.get(), NULL, user_.get(), NULL));
-  const base::Value* value = NULL;
-  EXPECT_FALSE(merged->Get("ProxySettings", &value));
-}
-
-TEST_F(ONCMergerTest, MergeWithEmptyPolicyProhibitsEverything) {
-  base::DictionaryValue emptyDict;
-  scoped_ptr<base::DictionaryValue> merged(
-      MergeSettingsWithPolicies(&emptyDict, NULL, user_.get(), NULL));
-  EXPECT_TRUE(merged->empty());
-}
-
-TEST_F(ONCMergerTest, MergeWithoutPolicyAllowsAnything) {
-  scoped_ptr<base::DictionaryValue> merged(
-      MergeSettingsWithPolicies(NULL, NULL, user_.get(), NULL));
-  EXPECT_TRUE(test_utils::Equals(user_.get(), merged.get()));
-}
-
-TEST_F(ONCMergerTest, MergeWithoutUserSettings) {
-  base::DictionaryValue emptyDict;
-  scoped_ptr<base::DictionaryValue> merged;
-
-  merged = MergeSettingsWithPolicies(policy_.get(), NULL, &emptyDict, NULL);
-  EXPECT_TRUE(test_utils::Equals(policy_without_recommended_.get(),
-                                 merged.get()));
-
-  merged = MergeSettingsWithPolicies(policy_.get(), NULL, NULL, NULL);
-  EXPECT_TRUE(test_utils::Equals(policy_without_recommended_.get(),
-                                 merged.get()));
-}
-
-TEST_F(ONCMergerTest, MandatoryUserPolicyOverwriteDevicePolicy) {
-  scoped_ptr<base::DictionaryValue> merged(MergeSettingsWithPolicies(
-      policy_.get(), device_policy_.get(), user_.get(), NULL));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *policy_, "VPN.OpenVPN.Port"));
-}
-
-TEST_F(ONCMergerTest, MandatoryDevicePolicyOverwritesRecommendedUserPolicy) {
-  scoped_ptr<base::DictionaryValue> merged(MergeSettingsWithPolicies(
-      policy_.get(), device_policy_.get(), user_.get(), NULL));
-  EXPECT_TRUE(HaveSameValueAt(*merged, *device_policy_,
-                              "VPN.OpenVPN.Username"));
-}
-
-}  // namespace merger
-}  // namespace onc
-}  // namespace chromeos