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

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 "chrome/browser/chromeos/network_settings/onc_merger.h"
+#include "chromeos/network/onc/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 "chromeos/network/onc/onc_constants.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,
                                            const std::string& path) {
@@ skipping 114 matching lines @@
 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