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

chrome/browser/extensions/settings/settings_test_util.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 "chrome/browser/extensions/settings/settings_test_util.h"
 
 #include "base/file_path.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/browser/extensions/settings/settings_frontend.h"
+#include "chrome/browser/extensions/settings/settings_namespace.h"
 
 namespace extensions {
 
 namespace settings_test_util {
 
 // Intended as a StorageCallback from GetStorage.
 static void AssignStorage(SettingsStorage** dst, SettingsStorage* src) {
   *dst = src;
 }
 
 SettingsStorage* GetStorage(
     const std::string& extension_id, SettingsFrontend* frontend) {
   SettingsStorage* storage = NULL;
   frontend->RunWithStorage(
       extension_id,
+      settings_namespace::SYNC,
       base::Bind(&AssignStorage, &storage));
   MessageLoop::current()->RunAllPending();
   return storage;
 }
 
 // MockExtensionService
 
 MockExtensionService::MockExtensionService() {}
 
 MockExtensionService::~MockExtensionService() {}
@@ skipping 58 matching lines @@
       static_cast<ExtensionServiceInterface*>(&extension_service_);
   return static_cast<ExtensionService*>(as_interface);
 }
 
 ExtensionEventRouter* MockProfile::GetExtensionEventRouter() {
   return event_router_.get();
 }
 
 // ScopedSettingsFactory
 
+ScopedSettingsStorageFactory::ScopedSettingsStorageFactory() {}
+
 ScopedSettingsStorageFactory::ScopedSettingsStorageFactory(
-    SettingsStorageFactory* delegate) : delegate_(delegate) {
-  DCHECK(delegate);
-}
+    const scoped_refptr<SettingsStorageFactory>& delegate)
+    : delegate_(delegate) {}
 
 ScopedSettingsStorageFactory::~ScopedSettingsStorageFactory() {}
 
-void ScopedSettingsStorageFactory::Reset(SettingsStorageFactory* delegate) {
-  DCHECK(delegate);
-  delegate_.reset(delegate);
+void ScopedSettingsStorageFactory::Reset(
+    const scoped_refptr<SettingsStorageFactory>& delegate) {
+  delegate_ = delegate;
 }
 
 SettingsStorage* ScopedSettingsStorageFactory::Create(
     const FilePath& base_path, const std::string& extension_id) {
+  DCHECK(delegate_.get());
   return delegate_->Create(base_path, extension_id);
 }
 
 }  // namespace settings_test_util
 
 }  // namespace extensions