Massage Autofill dialog sign in test to be more similar to actual sign in flow.

chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/account_chooser_model.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "chrome/browser/ui/autofill/data_model_wrapper.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h"
 #include "chrome/browser/ui/autofill/testable_autofill_dialog_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
 #include "components/autofill/content/browser/wallet/mock_wallet_client.h"
 #include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "components/autofill/core/browser/autofill_common_test.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/test_personal_data_manager.h"
 #include "components/autofill/core/browser/validation.h"
 #include "components/autofill/core/common/autofill_switches.h"
@@ skipping 62 matching lines @@
         mock_wallet_client_(
             Profile::FromBrowserContext(contents->GetBrowserContext())->
                 GetRequestContext(), this, form_data.origin),
         message_loop_runner_(runner),
         use_validation_(false),
         weak_ptr_factory_(this) {}
 
   virtual ~TestAutofillDialogController() {}
 
   virtual GURL SignInUrl() const OVERRIDE {
+    return GURL(chrome::kChromeUIVersionURL);
+  }
+
+  GURL SignInContinueUrl() const {
     return GURL(content::kAboutBlankURL);
   }
 
   virtual void ViewClosed() OVERRIDE {
     message_loop_runner_->Quit();
     AutofillDialogControllerImpl::ViewClosed();
   }
 
   virtual string16 InputValidityMessage(
       DialogSection section,
@@ skipping 62 matching lines @@
  protected:
   virtual PersonalDataManager* GetManager() OVERRIDE {
     return &test_manager_;
   }
 
   virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
     return &mock_wallet_client_;
   }
 
   virtual bool IsSignInContinueUrl(const GURL& url) const OVERRIDE {
-    return true;
+    return url == SignInContinueUrl();
   }
 
  private:
   // To specify our own metric logger.
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
     return metric_logger_;
   }
 
   const AutofillMetrics& metric_logger_;
   TestPersonalDataManager test_manager_;
@@ skipping 691 matching lines @@
   controller()->OnDidAuthenticateInstrument(true);
   controller()->OnDidGetFullWallet(wallet::GetTestFullWallet());
   controller()->ForceFinishSubmit();
 
   RunMessageLoop();
 
   EXPECT_EQ(1, test_generated_bubble_controller()->bubbles_shown());
   EXPECT_EQ(last_four, test_generated_bubble_controller()->backing_card_name());
 }
 
-// Simulates the user successfully signing in to the dialog for the first time.
-// The controller listens for nav entry commits and should not destroy the web
-// contents before its post load code runs (which would cause a crash).
-IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, SignInNoCrash) {
+// Simulates the user signing in to the dialog from the inline web contents.
+IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, SimulateSuccessfulSignIn) {
   browser()->profile()->GetPrefs()->SetBoolean(
       ::prefs::kAutofillDialogPayWithoutWallet,
       true);
 
   InitializeController();
 
+  controller()->OnDidFetchWalletCookieValue(std::string());
+  std::vector<std::string> usernames(1, "user@example.com");
+  controller()->OnUserNameFetchSuccess(usernames);

[Evan Stade, 2013/11/05 00:02:20]

I think it makes more sense to have a username fetch failure here

[Dan Beam, 2013/11/05 00:16:33]

Done.

+  controller()->OnDidGetWalletItems(
+      wallet::GetTestWalletItemsWithRequiredAction(wallet::GAIA_AUTH));
+
+  ui_test_utils::UrlLoadObserver sign_in_page_observer(
+      controller()->SignInUrl(),
+      content::NotificationService::AllSources());
+
+  // Simulate a user clicking "Sign In" (which loads dialog's web contents).
+  controller()->SignInLinkClicked();
+  EXPECT_TRUE(controller()->ShouldShowSignInWebView());
+
+  TestableAutofillDialogView* view = controller()->GetTestableView();
+  content::WebContents* sign_in_contents = view->GetSignInWebContents();
+  ASSERT_TRUE(sign_in_contents);
+
+  sign_in_page_observer.Wait();
+
+  ui_test_utils::UrlLoadObserver continue_page_observer(
+      controller()->SignInContinueUrl(),
+      content::NotificationService::AllSources());
+
+  EXPECT_EQ(sign_in_contents->GetURL(), controller()->SignInUrl());
+
   const AccountChooserModel& account_chooser_model =
       controller()->AccountChooserModelForTesting();
   EXPECT_FALSE(account_chooser_model.WalletIsSelected());
 
-  ui_test_utils::UrlLoadObserver observer(
-      controller()->SignInUrl(),
-      content::NotificationService::AllSources());
+  sign_in_contents->GetController().LoadURL(
+      controller()->SignInContinueUrl(),
+      content::Referrer(),
+      content::PAGE_TRANSITION_FORM_SUBMIT,
+      std::string());
 
-  controller()->SignInLinkClicked();
-  std::vector<std::string> usernames(1, "user@example.com");
-  controller()->OnUserNameFetchSuccess(usernames);
-  controller()->OnDidFetchWalletCookieValue(std::string());
+  continue_page_observer.Wait();
+  EXPECT_FALSE(controller()->ShouldShowSignInWebView());
+
+  content::RunAllPendingInMessageLoop();
+
   controller()->OnDidGetWalletItems(
-      wallet::GetTestWalletItemsWithRequiredAction(wallet::GAIA_AUTH));
+      wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
 
-  TestableAutofillDialogView* view = controller()->GetTestableView();
-  EXPECT_TRUE(view->GetSignInWebContents());
-  EXPECT_TRUE(controller()->ShouldShowSignInWebView());
-  observer.Wait();
-
-  // Wallet should now be selected and Chrome shouldn't have crashed.
+  // Wallet should now be selected and Chrome shouldn't have crashed (which can
+  // happen if the WebContents is deleted while proccessing a nav entry commit).
   EXPECT_TRUE(account_chooser_model.WalletIsSelected());
 }
 
 // Verify that filling a form works correctly, including filling the CVC when
 // that is requested separately.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, FillFormIncludesCVC) {
   AutofillDialogControllerImpl* controller =
       SetUpHtmlAndInvoke("<input autocomplete='cc-csc'>");
 
   AddCreditcardToProfile(controller->profile(), test::GetVerifiedCreditCard());
   AddAutofillProfileToProfile(controller->profile(),
                               test::GetVerifiedProfile());
 
   TestableAutofillDialogView* view = controller->GetTestableView();
   view->SetTextContentsOfSuggestionInput(SECTION_CC, ASCIIToUTF16("123"));
   view->SubmitForTesting();
   ExpectDomMessage("success");
   EXPECT_EQ("123", GetValueForHTMLFieldOfType("cc-csc"));
 }
 
 }  // namespace autofill