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

chromeos/network/onc/onc_merger.h

Index: chromeos/network/onc/onc_merger.h
diff --git a/chrome/browser/chromeos/network_settings/onc_merger.h b/chromeos/network/onc/onc_merger.h
similarity index 81%
rename from chrome/browser/chromeos/network_settings/onc_merger.h
rename to chromeos/network/onc/onc_merger.h
index dd32ed2be14f8a6b80f5090fc09ef8a92ae95c8f..8797f852a2dfc88111f5e3c9f5656e570ce892e5 100644
--- a/chrome/browser/chromeos/network_settings/onc_merger.h
+++ b/chromeos/network/onc/onc_merger.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_NETWORK_SETTINGS_ONC_MERGER_H_
-#define CHROME_BROWSER_CHROMEOS_NETWORK_SETTINGS_ONC_MERGER_H_
+#ifndef CHROMEOS_NETWORK_ONC_ONC_MERGER_H_
+#define CHROMEOS_NETWORK_ONC_ONC_MERGER_H_
 
 #include "base/memory/scoped_ptr.h"
+#include "chromeos/chromeos_export.h"
 
 namespace base {
 class DictionaryValue;
@@ -15,7 +16,7 @@ namespace chromeos {
 namespace onc {
 
 // Merges the given |user_onc| and |shared_onc| settings with the given
-// |user_policy| and |device_policy| settings. Each can be omitted by prodiving
+// |user_policy| and |device_policy| settings. Each can be omitted by providing
 // a NULL pointer. Each dictionary has to be a valid ONC dictionary. They don't
 // have to describe top-level ONC but should refer to the same section in
 // ONC. |user_onc| and |shared_onc| should not contain kRecommended fields. The
@@ -23,7 +24,7 @@ namespace onc {
 // a network with type: "WiFi", the field "VPN" is dispensable) that can be
 // removed by the caller using the ONC normalizer. ONC conformance of the
 // arguments is not checked. Use ONC validator for that.
-scoped_ptr<base::DictionaryValue> MergeSettingsWithPolicies(
+CHROMEOS_EXPORT scoped_ptr<base::DictionaryValue> MergeSettingsWithPolicies(
     const base::DictionaryValue* user_policy,
     const base::DictionaryValue* device_policy,
     const base::DictionaryValue* user_onc,
@@ -32,4 +33,4 @@ scoped_ptr<base::DictionaryValue> MergeSettingsWithPolicies(
 }  // namespace onc
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_NETWORK_SETTINGS_ONC_MERGER_H_
+#endif  // CHROMEOS_NETWORK_ONC_ONC_MERGER_H_