diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-08 21:01:53 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-08 21:01:53 +0000 |
| commit | d2d89d83b409ef32bcbf7fbafe0d4e33c95515f0 (patch) | |
| tree | 92b8d293fa14edb50312d1fe565852f29823fbdb /chrome/test | |
| parent | bca924e224f92b919ac329147e7ba3526b9ce12e (diff) | |
| download | chromium_src-d2d89d83b409ef32bcbf7fbafe0d4e33c95515f0.zip chromium_src-d2d89d83b409ef32bcbf7fbafe0d4e33c95515f0.tar.gz chromium_src-d2d89d83b409ef32bcbf7fbafe0d4e33c95515f0.tar.bz2 | |
Fix user scripts not getting initialized.
BUG=13290,13128
TEST=Add --enable-user-scripts to command line without --enable-extensions or --load-extension. Start Chrome, user scripts should work. Also run ui tests with --enable-extensions.
Review URL: http://codereview.chromium.org/119256
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17898 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/testing_profile.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 7abdd8f..40b88dd 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -106,11 +106,9 @@ class TestingProfile : public Profile { return NULL; } virtual PrefService* GetPrefs() { - FilePath prefs_filename; - PathService::Get(base::DIR_TEMP, &prefs_filename); - prefs_filename = - prefs_filename.Append(FILE_PATH_LITERAL("TestPreferences")); if (!prefs_.get()) { + FilePath prefs_filename = + path_.Append(FILE_PATH_LITERAL("TestPreferences")); prefs_.reset(new PrefService(prefs_filename, NULL)); Profile::RegisterUserPrefs(prefs_.get()); browser::RegisterAllPrefs(prefs_.get(), prefs_.get()); |