Fix sizing issues in the tab modal signin flow.

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"
 #include "chrome/browser/signin/account_tracker_service_factory.h"
 #include "chrome/browser/signin/fake_account_fetcher_service_builder.h"
 #include "chrome/browser/signin/fake_signin_manager_builder.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/dialog_test_browser_window.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/browser_sync/browser/profile_sync_service.h"
 #include "components/signin/core/browser/account_fetcher_service.h"
 #include "components/signin/core/browser/fake_account_fetcher_service.h"
 #include "components/signin/core/browser/fake_signin_manager.h"
 #include "content/public/test/test_web_ui.h"
 
 const int kExpectedProfileImageSize = 128;
 
+// The dialog needs to be initialized with a height but the actual value doesn't
+// really matter in unit tests.
+const double kDefaultDialogHeight = 350.0;
+
 class TestingSyncConfirmationHandler : public SyncConfirmationHandler {
  public:
   explicit TestingSyncConfirmationHandler(content::WebUI* web_ui) {
     set_web_ui(web_ui);
   }
 
   using SyncConfirmationHandler::HandleConfirm;
   using SyncConfirmationHandler::HandleUndo;
-  using SyncConfirmationHandler::HandleInitialized;
+  using SyncConfirmationHandler::HandleInitializedWithSize;
   using SyncConfirmationHandler::HandleGoToSettings;
   using SyncConfirmationHandler::SetUserImageURL;
 };
 
 class SyncConfirmationHandlerTest : public BrowserWithTestWindowTest {
  public:
   SyncConfirmationHandlerTest() : web_ui_(new content::TestWebUI) {}
   void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     chrome::NewTab(browser());
@@ skipping 69 matching lines @@
   }
 
 private:
   scoped_ptr<content::TestWebUI> web_ui_;
   scoped_ptr<SyncConfirmationUI> sync_confirmation_ui_;
   TestingSyncConfirmationHandler* handler_;  // Not owned.
   base::UserActionTester user_action_tester_;
 };
 
 TEST_F(SyncConfirmationHandlerTest, TestSetImageIfPrimaryAccountReady) {
+  browser()->ShowModalSyncConfirmationWindow();
   account_fetcher_service()->FakeUserInfoFetchSuccess(
       "gaia",
       "foo@example.com",
       "gaia",
       "",
       "full_name",
       "given_name",
       "locale",
       "http://picture.example.com/picture.jpg");
 
-  handler()->HandleInitialized(nullptr);
+  base::ListValue args;
+  args.Set(0, new base::FundamentalValue(kDefaultDialogHeight));
+  handler()->HandleInitializedWithSize(&args);
   EXPECT_EQ(1U, web_ui()->call_data().size());
   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));
 
   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) {
-  handler()->HandleInitialized(nullptr);
+  browser()->ShowModalSyncConfirmationWindow();
+
+  base::ListValue args;
+  args.Set(0, new base::FundamentalValue(kDefaultDialogHeight));
+  handler()->HandleInitializedWithSize(&args);
   EXPECT_EQ(0U, web_ui()->call_data().size());
 
   account_fetcher_service()->FakeUserInfoFetchSuccess(
       "gaia",
       "foo@example.com",
       "gaia",
       "",
       "full_name",
       "given_name",
       "locale",
@@ skipping 45 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"));
 }