Settings Rewrite: Fix Opening Sync User login

chrome/browser/ui/webui/options/sync_setup_handler.cc

Index: chrome/browser/ui/webui/options/sync_setup_handler.cc
diff --git a/chrome/browser/ui/webui/options/sync_setup_handler.cc b/chrome/browser/ui/webui/options/sync_setup_handler.cc
index 639f0688ca017095a31530aed20f34e5044be2fa..56e3d7661300420a851f4c7007c6d135045380a2 100644
--- a/chrome/browser/ui/webui/options/sync_setup_handler.cc
+++ b/chrome/browser/ui/webui/options/sync_setup_handler.cc
@@ -649,7 +649,7 @@ void SyncSetupHandler::HandleShowSetupUI(const base::ListValue* args) {
   // If a setup wizard is present on this page or another, bring it to focus.
   // Otherwise, display a new one on this page.
   if (!FocusExistingWizardIfPresent())
-    OpenSyncSetup(args);
+    OpenSyncSetup(false /* creating_supervised_user */);
 }
 
 #if defined(OS_CHROMEOS)
@@ -664,9 +664,12 @@ void SyncSetupHandler::HandleDoSignOutOnAuthError(const base::ListValue* args) {
 #if !defined(OS_CHROMEOS)
 void SyncSetupHandler::HandleStartSignin(const base::ListValue* args) {
   // Should only be called if the user is not already signed in.
-  DCHECK(!SigninManagerFactory::GetForProfile(GetProfile())->
-      IsAuthenticated());
-  OpenSyncSetup(args);
+  DCHECK(!SigninManagerFactory::GetForProfile(GetProfile())->IsAuthenticated());
+  bool creating_supervised_user = false;
+  std::string access_point;
+  if (args->GetString(0, &access_point))
+    creating_supervised_user = access_point == "access-point-supervised-user";

[dschuyler, 2016/01/20 02:16:21]

(optional) What do you think of:

std::string access_point;
bool creating_supervised_user = args->GetString(0, &access_point) &&
    access_point == "access-point-supervised-user";

[tommycli, 2016/01/20 19:17:12]

Done. Yes that def better.

+  OpenSyncSetup(creating_supervised_user);
 }
 
 void SyncSetupHandler::HandleStopSyncing(const base::ListValue* args) {
@@ -738,7 +741,7 @@ void SyncSetupHandler::CloseSyncSetup() {
   configuring_sync_ = false;
 }
 
-void SyncSetupHandler::OpenSyncSetup(const base::ListValue* args) {
+void SyncSetupHandler::OpenSyncSetup(bool creating_supervised_user) {
   if (!PrepareSyncSetup())
     return;
 
@@ -764,15 +767,9 @@ void SyncSetupHandler::OpenSyncSetup(const base::ListValue* args) {
     // setup including any visible overlays, and display the gaia auth page.
     // Control will be returned to the sync settings page once auth is complete.
     CloseUI();
-    if (args) {
-      std::string access_point = base::UTF16ToUTF8(ExtractStringValue(args));
-      if (access_point == "access-point-supervised-user") {
-        DisplayGaiaLogin(
-            signin_metrics::AccessPoint::ACCESS_POINT_SUPERVISED_USER);
-        return;
-      }
-    }
-    DisplayGaiaLogin(signin_metrics::AccessPoint::ACCESS_POINT_SETTINGS);
+    DisplayGaiaLogin(creating_supervised_user ?
+        signin_metrics::AccessPoint::ACCESS_POINT_SUPERVISED_USER :
+        signin_metrics::AccessPoint::ACCESS_POINT_SETTINGS);
     return;
   }
 #endif