Clear initial focus in Sync Confirmation dialog.

chrome/browser/ui/webui/signin/sync_confirmation_handler_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/signin/sync_confirmation_handler.h"
 
 #include "base/test/user_action_tester.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/signin/account_fetcher_service_factory.h"
@@ skipping 125 matching lines @@
       "gaia",
       "",
       "full_name",
       "given_name",
       "locale",
       "http://picture.example.com/picture.jpg");
 
   base::ListValue args;
   args.Set(0, new base::FundamentalValue(kDefaultDialogHeight));
   handler()->HandleInitializedWithSize(&args);
-  EXPECT_EQ(1U, web_ui()->call_data().size());
+  EXPECT_EQ(2U, web_ui()->call_data().size());
+
+  // When the primary account is ready, setUserImageURL happens before
+  // clearFocus since the image URL is known before showing the dialog.
   EXPECT_EQ("sync.confirmation.setUserImageURL",
             web_ui()->call_data()[0]->function_name());
   EXPECT_TRUE(
       web_ui()->call_data()[0]->arg1()->IsType(base::Value::TYPE_STRING));
   std::string passed_picture_url;
   EXPECT_TRUE(
       web_ui()->call_data()[0]->arg1()->GetAsString(&passed_picture_url));
 
+  EXPECT_EQ("sync.confirmation.clearFocus",
+            web_ui()->call_data()[1]->function_name());
+
   std::string original_picture_url =
       AccountTrackerServiceFactory::GetForProfile(profile())->
           GetAccountInfo("gaia").picture_url;
   GURL picture_url_with_size;
   EXPECT_TRUE(profiles::GetImageURLWithThumbnailSize(GURL(original_picture_url),
                                                      kExpectedProfileImageSize,
                                                      &picture_url_with_size));
   EXPECT_EQ(picture_url_with_size.spec(), passed_picture_url);
   handler()->HandleUndo(nullptr);
 }
 
 TEST_F(SyncConfirmationHandlerTest, TestSetImageIfPrimaryAccountReadyLater) {
   browser()->ShowModalSyncConfirmationWindow();
 
   base::ListValue args;
   args.Set(0, new base::FundamentalValue(kDefaultDialogHeight));
   handler()->HandleInitializedWithSize(&args);
-  EXPECT_EQ(0U, web_ui()->call_data().size());
+  EXPECT_EQ(1U, web_ui()->call_data().size());
 
   account_fetcher_service()->FakeUserInfoFetchSuccess(
       "gaia",
       "foo@example.com",
       "gaia",
       "",
       "full_name",
       "given_name",
       "locale",
       "http://picture.example.com/picture.jpg");
 
-  EXPECT_EQ(1U, web_ui()->call_data().size());
+  EXPECT_EQ(2U, web_ui()->call_data().size());
+
+  // When the primary account isn't yet ready when the dialog is shown,
+  // clearFocus is called before setUserImageURL.
+  EXPECT_EQ("sync.confirmation.clearFocus",
+            web_ui()->call_data()[0]->function_name());
+
   EXPECT_EQ("sync.confirmation.setUserImageURL",
-            web_ui()->call_data()[0]->function_name());
+            web_ui()->call_data()[1]->function_name());
   EXPECT_TRUE(
-      web_ui()->call_data()[0]->arg1()->IsType(base::Value::TYPE_STRING));
+      web_ui()->call_data()[1]->arg1()->IsType(base::Value::TYPE_STRING));
   std::string passed_picture_url;
   EXPECT_TRUE(
-      web_ui()->call_data()[0]->arg1()->GetAsString(&passed_picture_url));
+      web_ui()->call_data()[1]->arg1()->GetAsString(&passed_picture_url));
 
   std::string original_picture_url =
       AccountTrackerServiceFactory::GetForProfile(profile())->
           GetAccountInfo("gaia").picture_url;
   GURL picture_url_with_size;
   EXPECT_TRUE(profiles::GetImageURLWithThumbnailSize(GURL(original_picture_url),
                                                      kExpectedProfileImageSize,
                                                      &picture_url_with_size));
   EXPECT_EQ(picture_url_with_size.spec(), passed_picture_url);
   handler()->HandleUndo(nullptr);
@@ skipping 25 matching lines @@
   EXPECT_FALSE(sync()->IsFirstSetupInProgress());
   EXPECT_TRUE(sync()->IsFirstSetupComplete());
   EXPECT_TRUE(
       SigninManagerFactory::GetForProfile(profile())->IsAuthenticated());
   EXPECT_EQ(0, user_action_tester()->GetActionCount("Signin_Undo_Signin"));
   EXPECT_EQ(1, user_action_tester()->GetActionCount(
       "Signin_Signin_WithDefaultSyncSettings"));
   EXPECT_EQ(0, user_action_tester()->GetActionCount(
       "Signin_Signin_WithAdvancedSyncSettings"));
 }