rAc - Only show countries we're able to fill in.

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 322 matching lines @@
   // A helper function that cycles the MessageLoop, and on Mac, the Cocoa run
   // loop. It also drains the NSAutoreleasePool.
   void CycleRunLoops() {
     content::RunAllPendingInMessageLoop();
 #if defined(OS_MACOSX)
     chrome::testing::NSRunLoopRunAllPending();
     AutoreleasePool()->Recycle();
 #endif
   }
 
-  void InitializeController() {
+  void InitializeControllerWithoutShowing() {
     FormData form;
     form.name = ASCIIToUTF16("TestForm");
     form.method = ASCIIToUTF16("POST");
     form.user_submitted = true;
 
     FormFieldData field;
     field.autocomplete_attribute = "shipping tel";
     form.fields.push_back(field);
 
     test_generated_bubble_controller_ =
         new testing::NiceMock<TestGeneratedCreditCardBubbleController>(
             GetActiveWebContents());
     ASSERT_TRUE(test_generated_bubble_controller_->IsInstalled());
 
     message_loop_runner_ = new content::MessageLoopRunner;
     controller_ = new TestAutofillDialogController(
         GetActiveWebContents(),
         form,
         metric_logger_,
         message_loop_runner_);
+  }
+
+  void InitializeController() {
+    InitializeControllerWithoutShowing();
     controller_->Show();
     CycleRunLoops();  // Ensures dialog is fully visible.
   }
 
   content::WebContents* GetActiveWebContents() {
     return browser()->tab_strip_model()->GetActiveWebContents();
   }
 
   scoped_ptr<AutofillDialogViewTester> GetViewTester() {
     return AutofillDialogViewTester::For(controller()->view()).Pass();
@@ skipping 1073 matching lines @@
   view->SetTextContentsOfInput(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Belarus"));
   view->ActivateInput(ADDRESS_HOME_COUNTRY);
 
   // Verify the name is still there.
   EXPECT_EQ(ASCIIToUTF16("B. Loblaw"), view->GetTextContentsOfInput(NAME_FULL));
 
   EXPECT_TRUE(SectionHasField(SECTION_BILLING, ADDRESS_BILLING_SORTING_CODE));
   EXPECT_TRUE(SectionHasField(SECTION_SHIPPING, ADDRESS_HOME_SORTING_CODE));
 }
 
-// A shim to install a TestPersonalDataManager instead of the real thing.
-class TestPersonalDataManagerService
-    : public autofill::PersonalDataManagerService {
- public:
-  static BrowserContextKeyedService* Build(content::BrowserContext* profile) {
-    return new TestPersonalDataManagerService();
-  }
-
-  TestPersonalDataManagerService() {}
-  virtual ~TestPersonalDataManagerService() {}
-
-  virtual PersonalDataManager* GetPersonalDataManager() OVERRIDE {
-    return &test_data_manager_;
-  }
-  TestPersonalDataManager* GetTestPersonalDataManager() {
-    return &test_data_manager_;
-  }
-
- private:
-  TestPersonalDataManager test_data_manager_;
-  DISALLOW_COPY_AND_ASSIGN(TestPersonalDataManagerService);
-};
-
 // Changing the data source to or from Wallet preserves the shipping country,
 // but not the billing country because Wallet only supports US billing
 // addresses.
 IN_PROC_BROWSER_TEST_F(AutofillDialogControllerTest,
                        ChangingDataSourcePreservesCountry) {
-  // Set the default country to Canada.
-  static_cast<TestPersonalDataManagerService*>(
-      autofill::PersonalDataManagerFactory::GetInstance()->
-          SetTestingFactoryAndUse(
-              browser()->profile(),
-              TestPersonalDataManagerService::Build))->
-                  GetTestPersonalDataManager()->set_default_country_code("CA");
+  InitializeControllerWithoutShowing();
+  controller()->GetTestingManager()->set_default_country_code("CA");
+  controller()->Show();
+  CycleRunLoops();
 
-  InitializeController();
   AutofillProfile verified_profile(test::GetVerifiedProfile());
   controller()->GetTestingManager()->AddTestingProfile(&verified_profile);
 
   CreditCard verified_card(test::GetVerifiedCreditCard());
   controller()->GetTestingManager()->AddTestingCreditCard(&verified_card);
+  EXPECT_FALSE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
 
   controller()->OnDidFetchWalletCookieValue(std::string());
   scoped_ptr<wallet::WalletItems> items =
       wallet::GetTestWalletItems(wallet::AMEX_DISALLOWED);
   items->AddAccount(wallet::GetTestGaiaAccount());
   items->AddInstrument(wallet::GetTestMaskedInstrument());
   items->AddAddress(wallet::GetTestShippingAddress());
   controller()->OnDidGetWalletItems(items.Pass());
 
   EXPECT_TRUE(controller()->IsPayingWithWallet());
 
   // Select "Add new shipping address...".
   controller()->MenuModelForSection(SECTION_SHIPPING)->ActivatedAt(2);
+  EXPECT_TRUE(controller()->IsManuallyEditingSection(SECTION_SHIPPING));
 
-  // Default shipping country matches timezone, but default billing is always
-  // US in Wallet mode.
+  // Default shipping country matches PDM's default, but default billing is
+  // always US in Wallet mode.
   scoped_ptr<AutofillDialogViewTester> view = GetViewTester();
   ASSERT_EQ(ASCIIToUTF16("Canada"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
   ASSERT_EQ(ASCIIToUTF16("United States"),
             view->GetTextContentsOfInput(ADDRESS_BILLING_COUNTRY));
 
   // Switch the shipping country.
   view->SetTextContentsOfInput(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("Belarus"));
   EXPECT_EQ(ASCIIToUTF16("Belarus"),
             view->GetTextContentsOfInput(ADDRESS_HOME_COUNTRY));
@@ skipping 139 matching lines @@
   // Relevant country loaded but revalidation already happened, no further
   // validation should occur.
   controller()->OnAddressValidationRulesLoaded("DE", 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