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

chrome/browser/extensions/settings/settings_frontend_unittest.cc

 // Copyright (c) 2011 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.
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
 #include "chrome/browser/extensions/settings/settings_storage.h"
 #include "chrome/browser/extensions/settings/settings_test_util.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/test/test_browser_thread.h"
 
 namespace extensions {
 
 using content::BrowserThread;
 
 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:
   virtual ~NullSettingsStorageFactory() {}
 
   // SettingsStorageFactory implementation.
   virtual SettingsStorage* Create(
       const FilePath& base_path, const std::string& extension_id) OVERRIDE {
     return NULL;
   }
@@ skipping 14 matching lines @@
   }
 
   virtual void TearDown() OVERRIDE {
     frontend_.reset();
     profile_.reset();
   }
 
  protected:
   void ResetFrontend() {
     storage_factory_ =
-        new ScopedSettingsStorageFactory(
-            new SettingsLeveldbStorage::Factory());
+        new ScopedSettingsStorageFactory(new SettingsLeveldbStorage::Factory());
     frontend_.reset(SettingsFrontend::Create(storage_factory_, profile_.get()));
   }
 
   ScopedTempDir temp_dir_;
   scoped_ptr<MockProfile> profile_;
   scoped_ptr<SettingsFrontend> frontend_;
 
   // Owned by |frontend_|.
   ScopedSettingsStorageFactory* storage_factory_;
 
@@ skipping 118 matching lines @@
   storage = GetStorage(id, frontend_.get());
   ASSERT_TRUE(storage != NULL);
 
   EXPECT_TRUE(storage->Get().HasError());
   EXPECT_TRUE(storage->Clear().HasError());
   EXPECT_TRUE(storage->Set("foo", bar).HasError());
   EXPECT_TRUE(storage->Remove("foo").HasError());
 }
 
 }  // namespace extensions