Update from https://crrev.com/329939

base/prefs/testing_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/testing_pref_store.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
 TestingPrefStore::TestingPrefStore()
@@ skipping 24 matching lines @@
 }
 
 bool TestingPrefStore::HasObservers() const {
   return observers_.might_have_observers();
 }
 
 bool TestingPrefStore::IsInitializationComplete() const {
   return init_complete_;
 }
 
-void TestingPrefStore::SetValue(const std::string& key, base::Value* value) {
+void TestingPrefStore::SetValue(const std::string& key,
+                                base::Value* value,
+                                uint32 flags) {
   if (prefs_.SetValue(key, value)) {
     committed_ = false;
     NotifyPrefValueChanged(key);
   }
 }
 
 void TestingPrefStore::SetValueSilently(const std::string& key,
-                                        base::Value* value) {
+                                        base::Value* value,
+                                        uint32 flags) {
   if (prefs_.SetValue(key, value))
     committed_ = false;
 }
 
-void TestingPrefStore::RemoveValue(const std::string& key) {
+void TestingPrefStore::RemoveValue(const std::string& key, uint32 flags) {
   if (prefs_.RemoveValue(key)) {
     committed_ = false;
     NotifyPrefValueChanged(key);
   }
 }
 
 bool TestingPrefStore::ReadOnly() const {
   return read_only_;
 }
 
@@ skipping 27 matching lines @@
 
 void TestingPrefStore::NotifyInitializationCompleted() {
   DCHECK(!init_complete_);
   init_complete_ = true;
   if (read_success_ && read_error_ != PREF_READ_ERROR_NONE && error_delegate_)
     error_delegate_->OnError(read_error_);
   FOR_EACH_OBSERVER(
       Observer, observers_, OnInitializationCompleted(read_success_));
 }
 
-void TestingPrefStore::ReportValueChanged(const std::string& key) {
+void TestingPrefStore::ReportValueChanged(const std::string& key,
+                                          uint32 flags) {
   FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(key));
 }
 
 void TestingPrefStore::SetString(const std::string& key,
                                  const std::string& value) {
-  SetValue(key, new base::StringValue(value));
+  SetValue(key, new base::StringValue(value), DEFAULT_PREF_WRITE_FLAGS);
 }
 
 void TestingPrefStore::SetInteger(const std::string& key, int value) {
-  SetValue(key, new base::FundamentalValue(value));
+  SetValue(key, new base::FundamentalValue(value), DEFAULT_PREF_WRITE_FLAGS);
 }
 
 void TestingPrefStore::SetBoolean(const std::string& key, bool value) {
-  SetValue(key, new base::FundamentalValue(value));
+  SetValue(key, new base::FundamentalValue(value), DEFAULT_PREF_WRITE_FLAGS);
 }
 
 bool TestingPrefStore::GetString(const std::string& key,
                                  std::string* value) const {
   const base::Value* stored_value;
   if (!prefs_.GetValue(key, &stored_value) || !stored_value)
     return false;
 
   return stored_value->GetAsString(value);
 }
@@ skipping 30 matching lines @@
   read_success_ = read_success;
 }
 
 void TestingPrefStore::set_read_error(
     PersistentPrefStore::PrefReadError read_error) {
   DCHECK(!init_complete_);
   read_error_ = read_error;
 }
 
 TestingPrefStore::~TestingPrefStore() {}