Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5173)

Unified Diff: chrome/browser/extensions/settings/settings_frontend_unittest.cc

Issue 8539037: Extension Settings API: make it so that when changes received from Sync fail to (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments, sync Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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()));
}
« no previous file with comments | « chrome/browser/extensions/settings/settings_backend.cc ('k') | chrome/browser/extensions/settings/settings_quota_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698