| Index: chrome/browser/extensions/test_extension_prefs.h
|
| diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h
|
| index dc35c42b0e06adcccebc075e707377b40743a5ae..df77270e3512f8f55919968ba395af2f7842af63 100644
|
| --- a/chrome/browser/extensions/test_extension_prefs.h
|
| +++ b/chrome/browser/extensions/test_extension_prefs.h
|
| @@ -12,7 +12,6 @@
|
| #include "base/scoped_temp_dir.h"
|
| #include "chrome/common/extensions/extension.h"
|
|
|
| -class ExtensionPrefs;
|
| class ExtensionPrefValueMap;
|
| class PrefService;
|
|
|
| @@ -20,6 +19,9 @@ namespace base {
|
| class DictionaryValue;
|
| }
|
|
|
| +namespace extensions {
|
| +class ExtensionPrefs;
|
| +
|
| // This is a test class intended to make it easier to work with ExtensionPrefs
|
| // in tests.
|
| class TestExtensionPrefs {
|
| @@ -28,7 +30,9 @@ class TestExtensionPrefs {
|
| virtual ~TestExtensionPrefs();
|
|
|
| ExtensionPrefs* prefs() { return prefs_.get(); }
|
| - const ExtensionPrefs& const_prefs() const { return *prefs_.get(); }
|
| + const ExtensionPrefs& const_prefs() const {
|
| + return *prefs_.get();
|
| + }
|
| PrefService* pref_service() { return pref_service_.get(); }
|
| const FilePath& temp_dir() const { return temp_dir_.path(); }
|
|
|
| @@ -38,21 +42,21 @@ class TestExtensionPrefs {
|
|
|
| // Creates a new Extension with the given name in our temp dir, adds it to
|
| // our ExtensionPrefs, and returns it.
|
| - scoped_refptr<extensions::Extension> AddExtension(std::string name);
|
| + scoped_refptr<Extension> AddExtension(std::string name);
|
|
|
| // As above, but the extension is an app.
|
| - scoped_refptr<extensions::Extension> AddApp(std::string name);
|
| + scoped_refptr<Extension> AddApp(std::string name);
|
|
|
| // Similar to AddExtension, but takes a dictionary with manifest values.
|
| - scoped_refptr<extensions::Extension> AddExtensionWithManifest(
|
| + scoped_refptr<Extension> AddExtensionWithManifest(
|
| const base::DictionaryValue& manifest,
|
| - extensions::Extension::Location location);
|
| + Extension::Location location);
|
|
|
| // Similar to AddExtension, but takes a dictionary with manifest values
|
| // and extension flags.
|
| - scoped_refptr<extensions::Extension> AddExtensionWithManifestAndFlags(
|
| + scoped_refptr<Extension> AddExtensionWithManifestAndFlags(
|
| const base::DictionaryValue& manifest,
|
| - extensions::Extension::Location location,
|
| + Extension::Location location,
|
| int extra_flags);
|
|
|
| // Similar to AddExtension, this adds a new test Extension. This is useful for
|
| @@ -79,4 +83,6 @@ class TestExtensionPrefs {
|
| DISALLOW_COPY_AND_ASSIGN(TestExtensionPrefs);
|
| };
|
|
|
| +} // namespace extensions
|
| +
|
| #endif // CHROME_BROWSER_EXTENSIONS_TEST_EXTENSION_PREFS_H_
|
|
|