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

chrome/browser/extensions/settings/settings_test_util.h

Index: chrome/browser/extensions/settings/settings_test_util.h
diff --git a/chrome/browser/extensions/settings/settings_test_util.h b/chrome/browser/extensions/settings/settings_test_util.h
index 536093cf410646f9a9eb916886cb6c1dbcd40717..f7cac9d3465a6ef410d7c80944c7e27516e7d70e 100644
--- a/chrome/browser/extensions/settings/settings_test_util.h
+++ b/chrome/browser/extensions/settings/settings_test_util.h
@@ -12,6 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/settings/settings_storage_factory.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/testing_profile.h"
@@ -65,6 +66,24 @@ class MockProfile : public TestingProfile {
   scoped_ptr<ExtensionEventRouter> event_router_;
 };
 
+// SettingsStorageFactory which acts as a wrapper for other factories.
+class ScopedSettingsStorageFactory : public SettingsStorageFactory {
+ public:
+  explicit ScopedSettingsStorageFactory(SettingsStorageFactory* delegate);
+
+  virtual ~ScopedSettingsStorageFactory();
+
+  // Sets the delegate factory (equivalent to scoped_ptr::reset).
+  void Reset(SettingsStorageFactory* delegate);
+
+  // SettingsStorageFactory implementation.
+  virtual SettingsStorage* Create(
+      const FilePath& base_path, const std::string& extension_id) OVERRIDE;
+
+ private:
+  scoped_ptr<SettingsStorageFactory> delegate_;
+};
+
 }  // namespace settings_test_util
 
 }  // namespace extensions