Extension Settings API: make it so that when changes received from Sync fail to

chrome/browser/extensions/settings/settings_test_util.cc

Index: chrome/browser/extensions/settings/settings_test_util.cc
diff --git a/chrome/browser/extensions/settings/settings_test_util.cc b/chrome/browser/extensions/settings/settings_test_util.cc
index 11eb12f9d8e7fa230d8ee5b5f542d53cd0022d88..cc7fca12b8d02aea8a26aa4e91f57f581c364093 100644
--- a/chrome/browser/extensions/settings/settings_test_util.cc
+++ b/chrome/browser/extensions/settings/settings_test_util.cc
@@ -27,6 +27,8 @@ SettingsStorage* GetStorage(
   return storage;
 }
 
+// MockExtensionService
+
 MockExtensionService::MockExtensionService() {}
 
 MockExtensionService::~MockExtensionService() {}
@@ -73,6 +75,8 @@ void MockExtensionService::AddExtension(
   DCHECK(error.empty());
 }
 
+// MockProfile
+
 MockProfile::MockProfile(const FilePath& file_path)
     : TestingProfile(file_path) {
   event_router_.reset(new ExtensionEventRouter(this));
@@ -94,6 +98,25 @@ ExtensionEventRouter* MockProfile::GetExtensionEventRouter() {
   return event_router_.get();
 }
 
+// ScopedSettingsFactory
+
+ScopedSettingsStorageFactory::ScopedSettingsStorageFactory(
+    SettingsStorageFactory* delegate) : delegate_(delegate) {
+  DCHECK(delegate);
+}
+
+ScopedSettingsStorageFactory::~ScopedSettingsStorageFactory() {}
+
+void ScopedSettingsStorageFactory::Reset(SettingsStorageFactory* delegate) {
+  DCHECK(delegate);
+  delegate_.reset(delegate);
+}
+
+SettingsStorage* ScopedSettingsStorageFactory::Create(
+    const FilePath& base_path, const std::string& extension_id) {
+  return delegate_->Create(base_path, extension_id);
+}
+
 }  // namespace settings_test_util
 
 }  // namespace extensions