commit 64304a7356d23cbbe30cc7a61d2a63cc4de90990
author tengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Mar 31 00:52:51 2014
committer tengs@chromium.org <tengs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon Mar 31 00:52:51 2014
tree e2a9e7017299d7b6b6e82b005e7c7c9d2f934cf4
parent 08d469b27722f24233346b77477938b629ef7ae9

Launch easy unlock setup app from chrome://settings.

BUG=347709

Review URL: https://codereview.chromium.org/211333005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260479 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index f9cf121..fa6d8ad4 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -69,7 +69,7 @@
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/services/gcm/gcm_profile_service.h"
-#include "chrome/browser/signin/easy_unlock_controller.h"
+#include "chrome/browser/signin/easy_unlock.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/task_manager/task_manager.h"
@@ -350,7 +350,7 @@
   chrome_browser_net::Predictor::RegisterProfilePrefs(registry);
   chrome_prefs::RegisterProfilePrefs(registry);
   DownloadPrefs::RegisterProfilePrefs(registry);
-  EasyUnlockController::RegisterProfilePrefs(registry);
+  easy_unlock::RegisterProfilePrefs(registry);
   extensions::ExtensionPrefs::RegisterProfilePrefs(registry);
   extensions::launch_util::RegisterProfilePrefs(registry);
   ExtensionWebUI::RegisterProfilePrefs(registry);