Move preference MACs to the protected preference stores.

chrome/browser/prefs/tracked/dictionary_hash_store_contents.cc

+// Copyright (c) 2014 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/prefs/tracked/dictionary_hash_store_contents.h"
+
+#include "base/callback.h"
+#include "base/logging.h"
+#include "base/prefs/persistent_pref_store.h"
+#include "base/values.h"
+#include "components/pref_registry/pref_registry_syncable.h"
+
+namespace {
+
+// static
+const char kPreferenceMACs[] = "macs";

[gab, 2014/06/17 02:00:06]

Put both "macs" and "super_mac" under the same JSON node, i.e.:

"protection.macs"
"protection.super_mac"

or

"mac_store_contents.macs"
"mac_store_contents.super_mac"

[erikwright (departed), 2014/06/17 19:07:23]

Done.

+
+// static

[gab, 2014/06/17 02:00:06]

Remove "// static" here and above.

[erikwright (departed), 2014/06/17 19:07:24]

Done.

+const char kSuperMACPref[] = "super_mac";
+
+class MutablePreferenceMacDictionary
+    : public HashStoreContents::MutableDictionary {
+ public:
+  explicit MutablePreferenceMacDictionary(base::DictionaryValue* storage);
+
+  // MutableDictionary implementation
+  virtual base::DictionaryValue* operator->() OVERRIDE;
+
+ private:
+  base::DictionaryValue* storage_;
+  DISALLOW_COPY_AND_ASSIGN(MutablePreferenceMacDictionary);

[gab, 2014/06/17 02:00:05]

I think the Chromium style is to have an empty line before
DISALLOW_COPY_AND_ASSIGN, but I won't fight if you feel otherwise ;-)

[erikwright (departed), 2014/06/17 19:07:24]

Done.

+};
+
+MutablePreferenceMacDictionary::MutablePreferenceMacDictionary(
+    base::DictionaryValue* storage)
+    : storage_(storage) {
+}
+
+base::DictionaryValue* MutablePreferenceMacDictionary::operator->() {
+  base::DictionaryValue* mac_dictionary = NULL;
+
+  if (!storage_->GetDictionary(kPreferenceMACs, &mac_dictionary)) {
+    mac_dictionary = new base::DictionaryValue;
+    storage_->Set(kPreferenceMACs, mac_dictionary);
+  }
+
+  return mac_dictionary;
+}
+
+}  // namespace
+
+DictionaryHashStoreContents::DictionaryHashStoreContents(
+    base::DictionaryValue* storage)
+    : storage_(storage) {
+}
+
+// static
+void DictionaryHashStoreContents::RegisterProfilePrefs(
+    user_prefs::PrefRegistrySyncable* registry) {
+  registry->RegisterDictionaryPref(
+      kPreferenceMACs,
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry->RegisterStringPref(
+      kSuperMACPref,
+      std::string(),
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+}
+
+std::string DictionaryHashStoreContents::hash_store_id() const {
+  return "";
+}
+
+void DictionaryHashStoreContents::Reset() {
+  storage_->Remove(kPreferenceMACs, NULL);
+}
+
+bool DictionaryHashStoreContents::IsInitialized() const {
+  return storage_->GetDictionary(kPreferenceMACs, NULL);
+}
+
+const base::DictionaryValue* DictionaryHashStoreContents::GetContents() const {
+  const base::DictionaryValue* mac_dictionary = NULL;
+  storage_->GetDictionary(kPreferenceMACs, &mac_dictionary);
+  return mac_dictionary;
+}
+
+scoped_ptr<HashStoreContents::MutableDictionary>
+DictionaryHashStoreContents::GetMutableContents() {
+  return scoped_ptr<MutableDictionary>(
+      new MutablePreferenceMacDictionary(storage_));
+}
+
+std::string DictionaryHashStoreContents::GetSuperMac() const {
+  std::string super_mac_string;
+  storage_->GetString(kSuperMACPref, &super_mac_string);
+  return super_mac_string;
+}
+
+void DictionaryHashStoreContents::SetSuperMac(const std::string& super_mac) {
+  storage_->SetString(kSuperMACPref, super_mac);
+}