| Index: chrome/service/service_process.cc
|
| diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc
|
| index f59217e19a34a11eb132146432ee28187ef2e495..af04fbd1902398398d5129cd62bfb3adcfc219e0 100644
|
| --- a/chrome/service/service_process.cc
|
| +++ b/chrome/service/service_process.cc
|
| @@ -163,7 +163,8 @@ bool ServiceProcess::Initialize(base::MessageLoopForUI* message_loop,
|
| user_data_dir.Append(chrome::kServiceStateFileName);
|
| service_prefs_.reset(new ServiceProcessPrefs(
|
| pref_path,
|
| - JsonPrefStore::GetTaskRunnerForFile(pref_path, blocking_pool_.get())));
|
| + JsonPrefStore::GetTaskRunnerForFile(pref_path, blocking_pool_.get())
|
| + .get()));
|
| service_prefs_->ReadPrefs();
|
|
|
| // This switch it required to run connector with test gaia.
|
| @@ -203,8 +204,8 @@ bool ServiceProcess::Initialize(base::MessageLoopForUI* message_loop,
|
| // After the IPC server has started we signal that the service process is
|
| // ready.
|
| if (!service_process_state_->SignalReady(
|
| - io_thread_->message_loop_proxy(),
|
| - base::Bind(&ServiceProcess::Terminate, base::Unretained(this)))) {
|
| + io_thread_->message_loop_proxy().get(),
|
| + base::Bind(&ServiceProcess::Terminate, base::Unretained(this)))) {
|
| return false;
|
| }
|
|
|
|
|