Update from https://crrev.com/333737

base/prefs/testing_pref_store.h

 // 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.
 
 #ifndef BASE_PREFS_TESTING_PREF_STORE_H_
 #define BASE_PREFS_TESTING_PREF_STORE_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 25 matching lines @@
                 uint32 flags) override;
   void SetValueSilently(const std::string& key,
                         base::Value* value,
                         uint32 flags) override;
   void RemoveValue(const std::string& key, uint32 flags) override;
   bool ReadOnly() const override;
   PrefReadError GetReadError() const override;
   PersistentPrefStore::PrefReadError ReadPrefs() override;
   void ReadPrefsAsync(ReadErrorDelegate* error_delegate) override;
   void CommitPendingWrite() override;
+  void SchedulePendingLossyWrites() override;
 
   // Marks the store as having completed initialization.
   void SetInitializationCompleted();
 
   // Used for tests to trigger notifications explicitly.
   void NotifyPrefValueChanged(const std::string& key);
   void NotifyInitializationCompleted();
 
   // Some convenience getters/setters.
   void SetString(const std::string& key, const std::string& value);
@@ skipping 40 matching lines @@
   bool pending_async_read_;
 
   // Whether initialization has been completed.
   bool init_complete_;
 
   // Whether the store contents have been committed to disk since the last
   // mutation.
   bool committed_;
 
   scoped_ptr<ReadErrorDelegate> error_delegate_;
-  ObserverList<PrefStore::Observer, true> observers_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingPrefStore);
 };
 
 #endif  // BASE_PREFS_TESTING_PREF_STORE_H_