1 files changed, 42 insertions, 0 deletions
diff --git a/chromium/chrome/browser/prefs/chrome_pref_model_associator_client.h b/chromium/chrome/browser/prefs/chrome_pref_model_associator_client.h
new file mode 100644
index 00000000000..d11606a688d
--- /dev/null
+++ b/chromium/chrome/browser/prefs/chrome_pref_model_associator_client.h
@@ -0,0 +1,42 @@
+// Copyright 2015 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_PREFS_CHROME_PREF_MODEL_ASSOCIATOR_CLIENT_H_
+#define CHROME_BROWSER_PREFS_CHROME_PREF_MODEL_ASSOCIATOR_CLIENT_H_
+
+#include <string>
+
+#include "base/macros.h"
+#include "components/sync_preferences/pref_model_associator_client.h"
+
+namespace base {
+template <typename T>
+struct DefaultSingletonTraits;
+}
+
+class ChromePrefModelAssociatorClient
+    : public sync_preferences::PrefModelAssociatorClient {
+ public:
+  // Returns the global instance.
+  static ChromePrefModelAssociatorClient* GetInstance();
+
+ private:
+  friend struct base::DefaultSingletonTraits<ChromePrefModelAssociatorClient>;
+
+  ChromePrefModelAssociatorClient();
+  ~ChromePrefModelAssociatorClient() override;
+
+  // sync_preferences::PrefModelAssociatorClient implementation.
+  bool IsMergeableListPreference(const std::string& pref_name) const override;
+  bool IsMergeableDictionaryPreference(
+      const std::string& pref_name) const override;
+  std::unique_ptr<base::Value> MaybeMergePreferenceValues(
+      const std::string& pref_name,
+      const base::Value& local_value,
+      const base::Value& server_value) const override;
+
+  DISALLOW_COPY_AND_ASSIGN(ChromePrefModelAssociatorClient);
+};
+
+#endif  // CHROME_BROWSER_PREFS_CHROME_PREF_MODEL_ASSOCIATOR_CLIENT_H_