| Index: chrome/browser/extensions/extension_settings_storage_unittest.h
|
| diff --git a/chrome/browser/extensions/extension_settings_storage_unittest.h b/chrome/browser/extensions/extension_settings_storage_unittest.h
|
| index 1d5d66696ceedac22d761d5debb9809b79b91028..9d209a1d72d113b2da702556b12a237403cfcc01 100644
|
| --- a/chrome/browser/extensions/extension_settings_storage_unittest.h
|
| +++ b/chrome/browser/extensions/extension_settings_storage_unittest.h
|
| @@ -11,13 +11,14 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop.h"
|
| +#include "base/scoped_temp_dir.h"
|
| #include "base/task.h"
|
| #include "chrome/browser/extensions/extension_settings.h"
|
| #include "content/browser/browser_thread.h"
|
|
|
| // Parameter type for the value-parameterized tests.
|
| typedef ExtensionSettingsStorage* (*ExtensionSettingsStorageTestParam)(
|
| - ExtensionSettings* settings, const std::string& extension_id);
|
| + const ExtensionSettings& settings, const std::string& extension_id);
|
|
|
| // Test fixture for ExtensionSettingsStorage tests. Tests are defined in
|
| // extension_settings_storage_unittest.cc with configurations for both cached
|
| @@ -29,6 +30,7 @@ class ExtensionSettingsStorageTest
|
| virtual ~ExtensionSettingsStorageTest();
|
|
|
| virtual void SetUp() OVERRIDE;
|
| + virtual void TearDown() OVERRIDE;
|
|
|
| protected:
|
| ExtensionSettingsStorage* storage_;
|
| @@ -54,12 +56,13 @@ class ExtensionSettingsStorageTest
|
| scoped_ptr<DictionaryValue> dict123_;
|
|
|
| private:
|
| - scoped_refptr<ExtensionSettings> settings_;
|
| + ScopedTempDir temp_dir_;
|
| + scoped_ptr<ExtensionSettings> settings_;
|
|
|
| // Need these so that the DCHECKs for running on FILE or UI threads pass.
|
| - scoped_ptr<MessageLoopForUI> ui_message_loop_;
|
| - scoped_ptr<BrowserThread> ui_thread_;
|
| - scoped_ptr<BrowserThread> file_thread_;
|
| + MessageLoop message_loop_;
|
| + BrowserThread ui_thread_;
|
| + BrowserThread file_thread_;
|
| };
|
|
|
| #endif // CHROME_BROWSER_EXTENSIONS_EXTENSION_SETTINGS_STORAGE_UNITTEST_H_
|
|
|