Separate handler initialization from page initialization

chrome/browser/ui/webui/options2/browser_options_handler2.cc

Index: chrome/browser/ui/webui/options2/browser_options_handler2.cc
diff --git a/chrome/browser/ui/webui/options2/browser_options_handler2.cc b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
index 7756a54a9829790901497ce3e79ce1cd720ce593..4c888df533726d470c7bc38807c16501774049cc 100644
--- a/chrome/browser/ui/webui/options2/browser_options_handler2.cc
+++ b/chrome/browser/ui/webui/options2/browser_options_handler2.cc
@@ -542,17 +542,20 @@ void BrowserOptionsHandler::OnStateChanged() {
 
 void BrowserOptionsHandler::InitializeHandler() {
   Profile* profile = Profile::FromWebUI(web_ui());
+
+  // Create our favicon data source.
+  profile->GetChromeURLDataManager()->AddDataSource(
+      new FaviconSource(profile, FaviconSource::FAVICON));
+}
+
+void BrowserOptionsHandler::InitializePage() {
+  Profile* profile = Profile::FromWebUI(web_ui());
   PrefService* prefs = profile->GetPrefs();
 
   ProfileSyncService* sync_service(
       ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile));
   if (sync_service)
     sync_service->AddObserver(this);
-  OnStateChanged();
-
-  // Create our favicon data source.
-  profile->GetChromeURLDataManager()->AddDataSource(
-      new FaviconSource(profile, FaviconSource::FAVICON));
 
   default_browser_policy_.Init(prefs::kDefaultBrowserSettingEnabled,
                                g_browser_process->local_state(),
@@ -607,9 +610,8 @@ void BrowserOptionsHandler::InitializeHandler() {
   proxy_prefs_.reset(
       PrefSetObserver::CreateProxyPrefSetObserver(prefs, this));
 #endif  // !defined(OS_CHROMEOS)
-}
 
-void BrowserOptionsHandler::InitializePage() {
+  OnStateChanged();
   OnTemplateURLServiceChanged();
   ObserveThemeChanged();