Separate storage for protected preferences into Protected Preferences file.

chrome/browser/prefs/tracked/segregated_pref_store.cc

Index: chrome/browser/prefs/tracked/segregated_pref_store.cc
diff --git a/chrome/browser/prefs/tracked/segregated_pref_store.cc b/chrome/browser/prefs/tracked/segregated_pref_store.cc
index 5c51da9af003870b20b8304b43dc8a04d4abde06..e2ca92c1f7872e1eb3a8a031ab63cf71f4047537 100644
--- a/chrome/browser/prefs/tracked/segregated_pref_store.cc
+++ b/chrome/browser/prefs/tracked/segregated_pref_store.cc
@@ -119,20 +119,19 @@ bool SegregatedPrefStore::ReadOnly() const {
 PersistentPrefStore::PrefReadError SegregatedPrefStore::GetReadError() const {
   PersistentPrefStore::PrefReadError read_error =
       default_pref_store_->GetReadError();
-  return read_error != PersistentPrefStore::PREF_READ_ERROR_NONE
-             ? read_error
-             : selected_pref_store_->GetReadError();
+  if (read_error == PersistentPrefStore::PREF_READ_ERROR_NONE) {
+    read_error = selected_pref_store_->GetReadError();
+    if (read_error == PersistentPrefStore::PREF_READ_ERROR_NO_FILE)

[gab, 2014/04/01 20:19:52]

Add a comment as to why you disregard PREF_READ_ERROR_NO_FILE here.

[erikwright (departed), 2014/04/02 15:03:17]

Done. See also the class comments in the header.

+      read_error = PersistentPrefStore::PREF_READ_ERROR_NONE;
+  }
+  return read_error;
 }
 
 PersistentPrefStore::PrefReadError SegregatedPrefStore::ReadPrefs() {
-  PersistentPrefStore::PrefReadError unselected_read_error =
-      default_pref_store_->ReadPrefs();
-  PersistentPrefStore::PrefReadError selected_read_error =
-      selected_pref_store_->ReadPrefs();
-
-  return unselected_read_error != PersistentPrefStore::PREF_READ_ERROR_NONE
-             ? unselected_read_error
-             : selected_read_error;
+  default_pref_store_->ReadPrefs();
+  selected_pref_store_->ReadPrefs();
+
+  return GetReadError();
 }
 
 void SegregatedPrefStore::ReadPrefsAsync(ReadErrorDelegate* error_delegate) {