| Index: chrome/browser/ui/webui/options2/options_sync_setup_handler2.cc
|
| diff --git a/chrome/browser/ui/webui/options2/options_sync_setup_handler2.cc b/chrome/browser/ui/webui/options2/options_sync_setup_handler2.cc
|
| index 7f12258caf6e1f758943879180a532a462ed2bbc..caa8e4f234627806eac29d38972e20b178cd4727 100644
|
| --- a/chrome/browser/ui/webui/options2/options_sync_setup_handler2.cc
|
| +++ b/chrome/browser/ui/webui/options2/options_sync_setup_handler2.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/sync/profile_sync_service.h"
|
| +#include "chrome/browser/sync/profile_sync_service_factory.h"
|
| #include "content/public/browser/web_ui.h"
|
|
|
| namespace options2 {
|
| @@ -18,8 +19,8 @@ OptionsSyncSetupHandler::~OptionsSyncSetupHandler() {
|
| }
|
|
|
| void OptionsSyncSetupHandler::StepWizardForShowSetupUI() {
|
| - ProfileSyncService* service =
|
| - Profile::FromWebUI(web_ui())->GetProfileSyncService();
|
| + ProfileSyncService* service(ProfileSyncServiceFactory::
|
| + GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
|
| DCHECK(service);
|
|
|
| // We should bring up either a login or a configure flow based on the state of
|
| @@ -36,8 +37,8 @@ void OptionsSyncSetupHandler::StepWizardForShowSetupUI() {
|
| }
|
|
|
| void OptionsSyncSetupHandler::ShowSetupUI() {
|
| - ProfileSyncService* service =
|
| - Profile::FromWebUI(web_ui())->GetProfileSyncService();
|
| + ProfileSyncService* service(ProfileSyncServiceFactory::
|
| + GetInstance()->GetForProfile(Profile::FromWebUI(web_ui())));
|
| DCHECK(service);
|
|
|
| // The user is trying to manually load a syncSetup URL. We should bring up
|
|
|