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

chrome/browser/extensions/settings/settings_test_util.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_SETTINGS_SETTINGS_TEST_UTIL_H_
 #define CHROME_BROWSER_EXTENSIONS_SETTINGS_SETTINGS_TEST_UTIL_H_
 #pragma once
 
 #include <string>
 
+#include "base/compiler_specific.h"
+#include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/settings/settings_storage_factory.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/testing_profile.h"
 
 
@@ skipping 41 matching lines @@
   virtual ExtensionEventRouter* GetExtensionEventRouter() OVERRIDE;
 
  private:
   MockExtensionService extension_service_;
   scoped_ptr<ExtensionEventRouter> event_router_;
 };
 
 // SettingsStorageFactory which acts as a wrapper for other factories.
 class ScopedSettingsStorageFactory : public SettingsStorageFactory {
  public:
-  explicit ScopedSettingsStorageFactory(SettingsStorageFactory* delegate);
+  ScopedSettingsStorageFactory();
 
-  virtual ~ScopedSettingsStorageFactory();
+  explicit ScopedSettingsStorageFactory(
+      const scoped_refptr<SettingsStorageFactory>& delegate);
 
   // Sets the delegate factory (equivalent to scoped_ptr::reset).
-  void Reset(SettingsStorageFactory* delegate);
+  void Reset(const scoped_refptr<SettingsStorageFactory>& delegate);
 
   // SettingsStorageFactory implementation.
   virtual SettingsStorage* Create(
       const FilePath& base_path, const std::string& extension_id) OVERRIDE;
 
  private:
-  scoped_ptr<SettingsStorageFactory> delegate_;
+  // SettingsStorageFactory is refcounted.
+  virtual ~ScopedSettingsStorageFactory();
+
+  scoped_refptr<SettingsStorageFactory> delegate_;
 };
 
 }  // namespace settings_test_util
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_SETTINGS_SETTINGS_TEST_UTIL_H_