diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 20:52:48 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-01 20:52:48 +0000 |
| commit | dfa9add936c174cb007cd0759f6f918f666976b8 (patch) | |
| tree | aef0938d7da0232dd2b13ed00708eb39b1753c31 /chrome_frame | |
| parent | 8d9b1c6cf08bc52ff8268741776fe15bef9f84c3 (diff) | |
| download | chromium_src-dfa9add936c174cb007cd0759f6f918f666976b8.zip chromium_src-dfa9add936c174cb007cd0759f6f918f666976b8.tar.gz chromium_src-dfa9add936c174cb007cd0759f6f918f666976b8.tar.bz2 | |
Revert 165062 - We believe this change broke startup_tests
Original description:
Moved JsonPrefStore to use SequencedWorkerPool instead of FILE thread. The pool also ensures that the same file requests are written in order received and that they block on shutdown.
BUG=153367
TEST=existing unit/browser tests
Review URL: https://codereview.chromium.org/11027070
TBR=zelidrag@chromium.org
Review URL: https://codereview.chromium.org/11312046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165492 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 2fd8530..1f6c808 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -18,7 +18,6 @@ #include "base/lazy_instance.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/prefs/json_pref_store.h" #include "base/scoped_temp_dir.h" #include "base/string_piece.h" #include "base/string_util.h" @@ -353,9 +352,8 @@ void FilterDisabledTests() { // Same as BrowserProcessImpl, but uses custom profile manager. class FakeBrowserProcessImpl : public BrowserProcessImpl { public: - FakeBrowserProcessImpl(base::SequencedTaskRunner* local_state_task_runner, - const CommandLine& command_line) - : BrowserProcessImpl(local_state_task_runner, command_line) { + explicit FakeBrowserProcessImpl(const CommandLine& command_line) + : BrowserProcessImpl(command_line) { profiles_dir_.CreateUniqueTempDir(); } @@ -496,13 +494,7 @@ void FakeExternalTab::Initialize() { cmd->AppendSwitch(switches::kDisableWebResources); cmd->AppendSwitch(switches::kSingleProcess); - FilePath local_state_path; - CHECK(PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path)); - scoped_refptr<base::SequencedTaskRunner> local_state_task_runner = - JsonPrefStore::GetTaskRunnerForFile(local_state_path, - BrowserThread::GetBlockingPool()); - browser_process_.reset(new FakeBrowserProcessImpl(local_state_task_runner, - *cmd)); + browser_process_.reset(new FakeBrowserProcessImpl(*cmd)); // BrowserProcessImpl's constructor should set g_browser_process. DCHECK(g_browser_process); g_browser_process->SetApplicationLocale("en-US"); |