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

chrome/browser/extensions/settings/settings_frontend_unittest.cc

Index: chrome/browser/extensions/settings/settings_frontend_unittest.cc
diff --git a/chrome/browser/extensions/settings/settings_frontend_unittest.cc b/chrome/browser/extensions/settings/settings_frontend_unittest.cc
index 18a97bc9852a2e4e117f7c7fc6aaf8b68d54297b..e4a143393049d4e2860e7c2c10d1cc73190c0db3 100644
--- a/chrome/browser/extensions/settings/settings_frontend_unittest.cc
+++ b/chrome/browser/extensions/settings/settings_frontend_unittest.cc
@@ -23,30 +23,6 @@ using namespace settings_test_util;
 
 namespace {
 
-// SettingsStorageFactory which acts as a wrapper for other factories.
-class ScopedSettingsStorageFactory : public SettingsStorageFactory {
- public:
-  explicit ScopedSettingsStorageFactory(SettingsStorageFactory* delegate)
-      : delegate_(delegate) {
-    DCHECK(delegate);
-  }
-
-  virtual ~ScopedSettingsStorageFactory() {}
-
-  void Reset(SettingsStorageFactory* delegate) {
-    DCHECK(delegate);
-    delegate_.reset(delegate);
-  }
-
-  virtual SettingsStorage* Create(
-      const FilePath& base_path, const std::string& extension_id) OVERRIDE {
-    return delegate_->Create(base_path, extension_id);
-  }
-
- private:
-  scoped_ptr<SettingsStorageFactory> delegate_;
-};
-
 // A SettingsStorageFactory which always returns NULL.
 class NullSettingsStorageFactory : public SettingsStorageFactory {
  public:
@@ -81,8 +57,7 @@ class ExtensionSettingsFrontendTest : public testing::Test {
  protected:
   void ResetFrontend() {
     storage_factory_ =
-        new ScopedSettingsStorageFactory(
-            new SettingsLeveldbStorage::Factory());
+        new ScopedSettingsStorageFactory(new SettingsLeveldbStorage::Factory());
     frontend_.reset(SettingsFrontend::Create(storage_factory_, profile_.get()));
   }