Separate storage for protected preferences into Protected Preferences file.

chrome/browser/prefs/tracked/segregated_pref_store.cc

 // Copyright 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/segregated_pref_store.h"
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 
@@ skipping 101 matching lines @@
 }
 
 bool SegregatedPrefStore::ReadOnly() const {
   return selected_pref_store_->ReadOnly() ||
          default_pref_store_->ReadOnly();
 }
 
 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();
+  default_pref_store_->ReadPrefs();
+  selected_pref_store_->ReadPrefs();
 
-  return unselected_read_error != PersistentPrefStore::PREF_READ_ERROR_NONE
-             ? unselected_read_error
-             : selected_read_error;
+  return GetReadError();
 }
 
 void SegregatedPrefStore::ReadPrefsAsync(ReadErrorDelegate* error_delegate) {
   read_error_delegate_.reset(error_delegate);
   default_pref_store_->ReadPrefsAsync(NULL);
   selected_pref_store_->ReadPrefsAsync(NULL);
 }
 
 void SegregatedPrefStore::CommitPendingWrite() {
   default_pref_store_->CommitPendingWrite();
@@ skipping 27 matching lines @@
     scoped_ptr<base::Value> migrated_value(value->DeepCopy());
     value = NULL;
     default_pref_store_->SetValue(key, migrated_value.release());
     default_pref_store_->CommitPendingWrite();
     selected_pref_store_->RemoveValue(key);
     selected_pref_store_->CommitPendingWrite();
   }
 
   return default_pref_store_.get();
 }