Extension Settings API: move the API functions into an object SettingsNamepace,

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"
@@ skipping 11 matching lines @@
 using namespace settings_test_util;
 
 namespace {
 
 // To save typing SettingsStorage::DEFAULTS everywhere.
 const SettingsStorage::WriteOptions DEFAULTS = SettingsStorage::DEFAULTS;
 
 // 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;
   }
+
+ private:
+  // SettingsStorageFactory is refcounted.
+  virtual ~NullSettingsStorageFactory() {}
 };
 
 }
 
 class ExtensionSettingsFrontendTest : public testing::Test {
  public:
    ExtensionSettingsFrontendTest()
-      : ui_thread_(BrowserThread::UI, MessageLoop::current()),
+      : storage_factory_(new ScopedSettingsStorageFactory()),
+        ui_thread_(BrowserThread::UI, MessageLoop::current()),
         file_thread_(BrowserThread::FILE, MessageLoop::current()) {}
 
   virtual void SetUp() OVERRIDE {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     profile_.reset(new MockProfile(temp_dir_.path()));
     ResetFrontend();
   }
 
   virtual void TearDown() OVERRIDE {
     frontend_.reset();
     profile_.reset();
   }
 
  protected:
   void ResetFrontend() {
-    storage_factory_ =
-        new ScopedSettingsStorageFactory(new SettingsLeveldbStorage::Factory());
-    frontend_.reset(SettingsFrontend::Create(storage_factory_, profile_.get()));
+    storage_factory_->Reset(new SettingsLeveldbStorage::Factory());
+    frontend_.reset(
+        SettingsFrontend::Create(storage_factory_.get(), profile_.get()));
   }
 
   ScopedTempDir temp_dir_;
   scoped_ptr<MockProfile> profile_;
   scoped_ptr<SettingsFrontend> frontend_;
-
-  // Owned by |frontend_|.
-  ScopedSettingsStorageFactory* storage_factory_;
+  scoped_refptr<ScopedSettingsStorageFactory> storage_factory_;
 
  private:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
 };
 
 // Get a semblance of coverage for both extension and app settings by
 // alternating in each test.
 // TODO(kalman): explicitly test the two interact correctly.
@@ skipping 109 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(DEFAULTS, "foo", bar).HasError());
   EXPECT_TRUE(storage->Remove("foo").HasError());
 }
 
 }  // namespace extensions