Implementation of ONC signature, validator and normalizer.

chrome/browser/chromeos/network_settings/onc_merger.h

Index: chrome/browser/chromeos/network_settings/onc_merger.h
diff --git a/chrome/browser/chromeos/network_settings/onc_merger.h b/chrome/browser/chromeos/network_settings/onc_merger.h
new file mode 100644
index 0000000000000000000000000000000000000000..84455382e17f032d3b9595bac1c4c3a1e13bbe6d
--- /dev/null
+++ b/chrome/browser/chromeos/network_settings/onc_merger.h
@@ -0,0 +1,28 @@
+// 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_NETWORK_SETTINGS_ONC_MERGER_H_
+#define CHROME_BROWSER_CHROMEOS_NETWORK_SETTINGS_ONC_MERGER_H_
+
+#include <string>

[Mattias Nissler (ping if slow), 2012/09/18 16:29:08]

newline

[pneubeck (no reviews), 2012/10/02 15:03:02]

Done.

+#include "base/callback.h"
+
+namespace base {
+class DictionaryValue;
+}  // namespace base

[Mattias Nissler (ping if slow), 2012/09/18 16:29:08]

namespace comment not necessary here per convention

[pneubeck (no reviews), 2012/10/02 15:03:02]

Done.

+
+namespace chromeos {
+namespace onc {
+
+class ONCMerger {

[Mattias Nissler (ping if slow), 2012/09/18 16:29:08]

if you don't intend on adding state, this should become namespace onc_merger

[pneubeck (no reviews), 2012/10/02 15:03:02]

Done.

+ public:
+  static base::DictionaryValue* MergeUserSettingsWithPolicy(

[Mattias Nissler (ping if slow), 2012/09/18 16:29:08]

could use a description comment

[pneubeck (no reviews), 2012/10/02 15:03:02]

Done.

+      const base::DictionaryValue& user,
+      const base::DictionaryValue& policy);
+};
+
+}  // namespace onc
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_NETWORK_SETTINGS_ONC_MERGER_H_