rAc: partial revert of 251484 to show correct sections in views dialog.

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 1286 matching lines @@
   EXPECT_EQ(2, browser()->tab_strip_model()->count());
   ASSERT_NE(dialog_invoker, GetActiveWebContents());
 
   // Closing the tab opened by "Manage my shipping details..." should refresh
   // the dialog.
   controller()->ClearLastWalletItemsFetchTimestampForTesting();
   EXPECT_CALL(*controller()->GetTestingWalletClient(), GetWalletItems());
   GetActiveWebContents()->Close();
 }
 
+// Changes from Wallet to Autofill and verifies that the combined billing/cc
+// sections are showing (or not) at the correct times.
+IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
+                       ChangingDataSourceShowsCorrectSections) {
+  scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
+  EXPECT_TRUE(view->IsShowingSection(SECTION_CC));
+  EXPECT_TRUE(view->IsShowingSection(SECTION_BILLING));
+  EXPECT_FALSE(view->IsShowingSection(SECTION_CC_BILLING));
+
+  // Switch the dialog to paying with Wallet.
+  controller()->OnDidFetchWalletCookieValue(std::string());
+  controller()->OnDidGetWalletItems(
+      wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED));
+  ASSERT_TRUE(controller()->IsPayingWithWallet());
+
+  EXPECT_FALSE(view->IsShowingSection(SECTION_CC));
+  EXPECT_FALSE(view->IsShowingSection(SECTION_BILLING));
+  EXPECT_TRUE(view->IsShowingSection(SECTION_CC_BILLING));
+
+  // Now switch back to Autofill to ensure this direction works as well.
+  ui::MenuModel* account_chooser = controller()->MenuModelForAccountChooser();
+  account_chooser->ActivatedAt(account_chooser->GetItemCount() - 1);
+
+  EXPECT_TRUE(view->IsShowingSection(SECTION_CC));
+  EXPECT_TRUE(view->IsShowingSection(SECTION_BILLING));
+  EXPECT_FALSE(view->IsShowingSection(SECTION_CC_BILLING));
+}
+
 // http://crbug.com/318526
 #if defined(OS_MACOSX)
 #define MAYBE_DoesWorkOnHttpWithFlag DISABLED_DoesWorkOnHttpWithFlag
 #else
 #define MAYBE_DoesWorkOnHttpWithFlag DoesWorkOnHttpWithFlag
 #endif
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        MAYBE_DoesWorkOnHttpWithFlag) {
   net::SpawnedTestServer http_server(
       net::SpawnedTestServer::TYPE_HTTP,
@@ skipping 289 matching lines @@
   // Relevant country loaded but revalidation already happened, no further
   // validation should occur.
   controller()->OnAddressValidationRulesLoaded("CN", false);
 
   // Cancelling the dialog causes additional validation to see if the user
   // cancelled with invalid fields, so verify and clear here.
   testing::Mock::VerifyAndClearExpectations(controller()->GetMockValidator());
 }
 
 }  // namespace autofill