diff options
| author | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 15:01:35 +0000 |
|---|---|---|
| committer | sanjeevr@chromium.org <sanjeevr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-21 15:01:35 +0000 |
| commit | ea587b01337fd38626923e48258a2b39a631543a (patch) | |
| tree | 944b56193e7870f97877836e490556b0983f5b0a /chrome_frame | |
| parent | 893934384f65e8676d226396c34625880a46436a (diff) | |
| download | chromium_src-ea587b01337fd38626923e48258a2b39a631543a.zip chromium_src-ea587b01337fd38626923e48258a2b39a631543a.tar.gz chromium_src-ea587b01337fd38626923e48258a2b39a631543a.tar.bz2 | |
Removed dependency on ChromeThread from JsonPrefStore and moved JsonPrefStore and PrefStore to chrome/common. This is because JsonPrefStore is needed in the service process
BUG=None.
TEST=Updated unit-tests
Review URL: http://codereview.chromium.org/2066015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47915 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 1a2176b..70a6ee4 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -35,13 +35,14 @@ #include "base/string_util.h" #include "base/test/test_file_util.h" #include "base/time.h" -#include "chrome/browser/json_pref_store.h" +#include "chrome/browser/chrome_thread.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/pref_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" +#include "chrome/common/json_pref_store.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome_frame/test/chrome_frame_test_utils.h" @@ -468,7 +469,10 @@ class PageLoadTest : public testing::Test { FilePath local_state_path; chrome::GetChromeFrameUserDataDirectory(&local_state_path); - PrefService* local_state = new PrefService(new JsonPrefStore(local_state_path)); + PrefService* local_state = new PrefService( + new JsonPrefStore( + local_state_path, + ChromeThread::GetMessageLoopProxyForThread(ChromeThread::FILE))); return local_state; } |