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

chromeos/network/onc/onc_merger.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 <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/cros/onc_constants.h"
+#include "chromeos/network/onc/onc_constants.h"
 
 namespace chromeos {
 namespace onc {
 namespace {
 
 typedef scoped_ptr<base::DictionaryValue> DictionaryPtr;
 
 // Inserts |true| at every field name in |result| that is recommended in policy.
 void MarkRecommendedFieldnames(const base::DictionaryValue& policy,
                               base::DictionaryValue* result) {
@@ skipping 141 matching lines @@
   MergeDictionaryIfNotNULL(reduced_shared_onc.get(), result.get());
   MergeDictionaryIfNotNULL(reduced_user_onc.get(), result.get());
   MergeDictionaryIfNotNULL(device_mandatory.get(), result.get());
   MergeDictionaryIfNotNULL(user_mandatory.get(), result.get());
 
   return result.Pass();
 }
 
 }  // namespace onc
 }  // namespace chromeos