rAc: don't open sign in continue url in new tab

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/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/autofill/testable_autofill_dialog_view.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.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_service_url.h"
 #include "components/autofill/content/browser/wallet/wallet_test_util.h"
 #include "components/autofill/core/browser/autofill_metrics.h"
 #include "components/autofill/core/browser/autofill_test_utils.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"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
@@ skipping 81 matching lines @@
         use_validation_(false),
         weak_ptr_factory_(this),
         sign_in_user_index_(0U) {}
 
   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 base::string16 InputValidityMessage(
       DialogSection section,
       ServerFieldType type,
       const base::string16& value) OVERRIDE {
     if (!use_validation_)
@@ skipping 67 matching lines @@
     return &const_cast<TestAutofillDialogController*>(this)->test_manager_;
   }
 
   virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
     return &mock_wallet_client_;
   }
 
   virtual bool IsSignInContinueUrl(const GURL& url, size_t* user_index) const
       OVERRIDE {
     *user_index = sign_in_user_index_;
-    return url == SignInContinueUrl();
+    return url == wallet::GetSignInContinueUrl();
   }
 
  private:
   // To specify our own metric logger.
   virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
     return metric_logger_;
   }
 
   const AutofillMetrics& metric_logger_;
   TestPersonalDataManager test_manager_;
@@ skipping 823 matching lines @@
   EXPECT_EQ(1, test_generated_bubble_controller()->bubbles_shown());
   EXPECT_EQ(last_four, test_generated_bubble_controller()->backing_card_name());
 }
 
 // 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);
 
+  wallet::SetUseTestingSignInContinueUrl();

[groby-ooo-7-16, 2014/01/03 00:10:22]

Since this is a browser test, I'd prefer it if we used a FakeURLFetcherFactory.
It's a bit more code, but it keeps us from creating global state for testing.

[Evan Stade, 2014/01/03 01:47:44]

I added a FakeURLFetcherFactory (see second to last patchset), but then noticed
it doesn't appear to even be needed.

   InitializeController();
 
   controller()->OnDidFetchWalletCookieValue(std::string());
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItemsWithRequiredAction(wallet::GAIA_AUTH));
 
   NavEntryCommittedObserver 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();
 
   NavEntryCommittedObserver continue_page_observer(
-      controller()->SignInContinueUrl(),
+      wallet::GetSignInContinueUrl(),
       content::NotificationService::AllSources());
 
   EXPECT_EQ(sign_in_contents->GetURL(), controller()->SignInUrl());
 
   AccountChooserModel* account_chooser_model =
       controller()->AccountChooserModelForTesting();
   EXPECT_FALSE(account_chooser_model->WalletIsSelected());
 
-  sign_in_contents->GetController().LoadURL(
-      controller()->SignInContinueUrl(),
-      content::Referrer(),
-      content::PAGE_TRANSITION_FORM_SUBMIT,
-      std::string());
+  content::OpenURLParams params(wallet::GetSignInContinueUrl(),
+                                content::Referrer(),
+                                CURRENT_TAB,
+                                content::PAGE_TRANSITION_LINK,

[groby-ooo-7-16, 2014/01/03 00:10:22]

Question - why the move to calling OpenURLFromTab instead of LoadURL?

[Evan Stade, 2014/01/03 00:14:57]

because I'm trying to test AutofillDialogSignInDelegate::OpenURLFromTab(). That
this test didn't cover that function before is the reason this test didn't catch
the regression.

+                                true);
+  sign_in_contents->GetDelegate()->OpenURLFromTab(sign_in_contents, params);
 
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems());
   continue_page_observer.Wait();
   content::RunAllPendingInMessageLoop();
 
   EXPECT_FALSE(controller()->ShouldShowSignInWebView());
 
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
 
   // 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());
 }
 
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest, AddAccount) {
+  wallet::SetUseTestingSignInContinueUrl();
   InitializeController();
 
   controller()->OnDidFetchWalletCookieValue(std::string());
   std::vector<std::string> usernames;
   usernames.push_back("user_0@example.com");
   controller()->OnDidGetWalletItems(
       wallet::GetTestWalletItemsWithUsers(usernames, 0));
 
   // Switch to Autofill.
   AccountChooserModel* account_chooser_model =
@@ skipping 10 matching lines @@
       account_chooser_model->GetItemCount() - 2);
   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();
 
   NavEntryCommittedObserver continue_page_observer(
-      controller()->SignInContinueUrl(),
+      wallet::GetSignInContinueUrl(),
       content::NotificationService::AllSources());
 
   EXPECT_EQ(sign_in_contents->GetURL(), controller()->SignInUrl());
 
   EXPECT_FALSE(account_chooser_model->WalletIsSelected());
 
   // User signs into new account, account 3.
   controller()->set_sign_in_user_index(3U);
-  sign_in_contents->GetController().LoadURL(
-      controller()->SignInContinueUrl(),
-      content::Referrer(),
-      content::PAGE_TRANSITION_FORM_SUBMIT,
-      std::string());
+  content::OpenURLParams params(wallet::GetSignInContinueUrl(),
+                                content::Referrer(),
+                                CURRENT_TAB,
+                                content::PAGE_TRANSITION_LINK,
+                                true);
+  sign_in_contents->GetDelegate()->OpenURLFromTab(sign_in_contents, params);
 
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems());
   continue_page_observer.Wait();
   content::RunAllPendingInMessageLoop();
 
   EXPECT_FALSE(controller()->ShouldShowSignInWebView());
   EXPECT_EQ(3U, controller()->GetTestingWalletClient()->user_index());
 
   usernames.push_back("user_1@example.com");
   usernames.push_back("user_2@example.com");
@@ skipping 245 matching lines @@
                        MAYBE_DoesntWorkOnBrokenHttps) {
   net::SpawnedTestServer https_server(
       net::SpawnedTestServer::TYPE_HTTPS,
       SSLOptions(SSLOptions::CERT_EXPIRED),
       base::FilePath(FILE_PATH_LITERAL("chrome/test/data")));
   ASSERT_TRUE(https_server.Start());
   EXPECT_FALSE(RunTestPage(https_server));
 }
 
 }  // namespace autofill