Re-commit 106660 with the crashing test disabled.

chrome/browser/extensions/extension_settings_api.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_EXTENSION_SETTINGS_API_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_SETTINGS_API_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_settings_backend.h"
 #include "chrome/browser/extensions/extension_settings_storage.h"
 
 // Superclass of all settings functions.
 class SettingsFunction : public AsyncExtensionFunction {
  protected:
   virtual bool RunImpl() OVERRIDE;
 
   // Extension settings function implementations should do their work here.
   // This runs on the FILE thread.
   //
   // Implementations should fill in args themselves, though (like RunImpl)
   // may return false to imply failure.
-  virtual bool RunWithStorage(ExtensionSettingsStorage* storage) = 0;
+  virtual bool RunWithStorage(
+      ExtensionSettingsBackend* backend,
+      ExtensionSettingsStorage* storage) = 0;
 
   // Sets error_ or result_ depending on the value of a storage Result, and
   // returns whether the Result implies success (i.e. !error).
-  bool UseResult(const ExtensionSettingsStorage::Result& storage_result);
+  bool UseResult(
+      ExtensionSettingsBackend* backend,
+      const ExtensionSettingsStorage::Result& storage_result);
 
  private:
   // Called via PostTask from RunImpl.  Calls RunWithStorage and then
   // SendReponse with its success value.
   void RunWithBackendOnFileThread(ExtensionSettingsBackend* backend);
 };
 
 class GetSettingsFunction : public SettingsFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.settings.get");
 
  protected:
-  virtual bool RunWithStorage(ExtensionSettingsStorage* storage) OVERRIDE;
+  virtual bool RunWithStorage(
+      ExtensionSettingsBackend* backend,
+      ExtensionSettingsStorage* storage) OVERRIDE;
 };
 
 class SetSettingsFunction : public SettingsFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.settings.set");
 
  protected:
-  virtual bool RunWithStorage(ExtensionSettingsStorage* storage) OVERRIDE;
+  virtual bool RunWithStorage(
+      ExtensionSettingsBackend* backend,
+      ExtensionSettingsStorage* storage) OVERRIDE;
 };
 
 class RemoveSettingsFunction : public SettingsFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.settings.remove");
 
  protected:
-  virtual bool RunWithStorage(ExtensionSettingsStorage* storage) OVERRIDE;
+  virtual bool RunWithStorage(
+      ExtensionSettingsBackend* backend,
+      ExtensionSettingsStorage* storage) OVERRIDE;
 };
 
 class ClearSettingsFunction : public SettingsFunction {
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.settings.clear");
 
  protected:
-  virtual bool RunWithStorage(ExtensionSettingsStorage* storage) OVERRIDE;
+  virtual bool RunWithStorage(
+      ExtensionSettingsBackend* backend,
+      ExtensionSettingsStorage* storage) OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_SETTINGS_API_H_