Update from https://crrev.com/333737

base/prefs/testing_pref_store.h

Index: base/prefs/testing_pref_store.h
diff --git a/base/prefs/testing_pref_store.h b/base/prefs/testing_pref_store.h
index 3de5cacb1bf4bf33879c361b46a8e141623e1ce6..f43a0309240f3039052ff9aa827e026a036c4862 100644
--- a/base/prefs/testing_pref_store.h
+++ b/base/prefs/testing_pref_store.h
@@ -43,6 +43,7 @@ class TestingPrefStore : public PersistentPrefStore {
   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();
@@ -103,7 +104,7 @@ class TestingPrefStore : public PersistentPrefStore {
   bool committed_;
 
   scoped_ptr<ReadErrorDelegate> error_delegate_;
-  ObserverList<PrefStore::Observer, true> observers_;
+  base::ObserverList<PrefStore::Observer, true> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingPrefStore);
 };