diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 20:59:33 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-19 20:59:33 +0000 |
| commit | 70a317ae674e7321c2a6e9ed7e4f900eaa6804f3 (patch) | |
| tree | e0cc6d6e24947d16e393d6aaa28300acf2de83be /chrome_frame | |
| parent | 354ee53da13cf83ce387f84c7a8f164fa0339c03 (diff) | |
| download | chromium_src-70a317ae674e7321c2a6e9ed7e4f900eaa6804f3.zip chromium_src-70a317ae674e7321c2a6e9ed7e4f900eaa6804f3.tar.gz chromium_src-70a317ae674e7321c2a6e9ed7e4f900eaa6804f3.tar.bz2 | |
Introduce PrefServiceBuilder, use for ChromePrefServiceBuilder.
This change extracts a non-test PrefServiceBuilder from
PrefServiceMockBuilder, and extracts the Chrome-specific logic
previously in pref_service.cc that was used to put together a
PrefService for Chrome into a ChromePrefServiceBuilder subclass
thereof.
TBR=ben@chromium.org
BUG=155525
Review URL: https://chromiumcodereview.appspot.com/11570007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173988 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/reliability/page_load_test.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 72e653b..478ce54 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -54,6 +54,7 @@ #include "chrome_frame/test/ie_event_sink.h" #include "chrome_frame/test/reliability/page_load_test.h" #include "chrome_frame/utils.h" +#include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" #include "net/base/net_util.h" #include "testing/gmock/include/gmock/gmock.h" @@ -430,7 +431,10 @@ class PageLoadTest : public testing::Test { PrefService* GetLocalState() { FilePath path; chrome::GetChromeFrameUserDataDirectory(&path); - return PrefServiceMockBuilder().WithUserFilePrefs(path).Create(); + return PrefServiceMockBuilder().WithUserFilePrefs( + path, + JsonPrefStore::GetTaskRunnerForFile( + path, content::BrowserThread::GetBlockingPool())).Create(); } void GetStabilityMetrics(NavigationMetrics* metrics) { |