Commit changes after a reset.

base/prefs/json_pref_store.cc

 // 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.
 
 #include "base/prefs/json_pref_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 296 matching lines @@
       // If the file just doesn't exist, maybe this is first run.  In any case
       // there's no harm in writing out default prefs in this case.
       break;
     case PREF_READ_ERROR_JSON_PARSE:
     case PREF_READ_ERROR_JSON_REPEAT:
       break;
     default:
       NOTREACHED() << "Unknown error: " << error;
   }
 
-  if (pref_filter_)
-    pref_filter_->FilterOnLoad(prefs_.get());
+  if (pref_filter_) {
+    if (pref_filter_->FilterOnLoad(prefs_.get())) {
+      writer_.ScheduleWrite(this);
+      writer_.DoScheduledWrite();

[gab, 2014/04/04 21:02:07]

I don't think you need to commit changes, scheduling is enough.

[erikwright (departed), 2014/04/07 14:57:14]

Fair enough.

+    }
+  }
 
   if (error_delegate_.get() && error != PREF_READ_ERROR_NONE)
     error_delegate_->OnError(error);
 
   FOR_EACH_OBSERVER(PrefStore::Observer,
                     observers_,
                     OnInitializationCompleted(true));
 }
 
 JsonPrefStore::~JsonPrefStore() {
   CommitPendingWrite();
 }
 
 bool JsonPrefStore::SerializeData(std::string* output) {
   if (pref_filter_)
     pref_filter_->FilterSerializeData(prefs_.get());
 
   JSONStringValueSerializer serializer(output);
   serializer.set_pretty_print(true);
   return serializer.Serialize(*prefs_);
 }