Disable wallet in countries where it's not supported, take 2.

chrome/browser/ui/autofill/autofill_dialog_controller_unittest.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 <map>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 2604 matching lines @@
       if (inputs[j].type == CREDIT_CARD_NUMBER)
         EXPECT_FALSE(controller()->InputIsEditable(inputs[j], sections[i]));
       else
         EXPECT_TRUE(controller()->InputIsEditable(inputs[j], sections[i]));
     }
   }
 }
 
 // When the default country is something besides US, wallet is not selected
 // and the account chooser shouldn't be visible.
-// TODO(estade): this is disabled until http://crbug.com/323641 is fixed.
-TEST_F(AutofillDialogControllerTest, DISABLED_HideWalletInOtherCountries) {
+TEST_F(AutofillDialogControllerTest, HideWalletInOtherCountries) {
+  // Addresses from different countries.
+  AutofillProfile us_profile(base::GenerateGUID(), kSettingsOrigin),
+      es_profile(base::GenerateGUID(), kSettingsOrigin),
+      es_profile2(base::GenerateGUID(), kSettingsOrigin);
+  us_profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("US"));
+  es_profile.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("ES"));
+  es_profile2.SetRawInfo(ADDRESS_HOME_COUNTRY, ASCIIToUTF16("ES"));
+
+  // If US is indicated (via timezone), show Wallet.
   ResetControllerWithFormData(DefaultFormData());
-  controller()->GetTestingManager()->set_default_country_code("US");
+  controller()->GetTestingManager()->set_timezone_country_code("US");
   controller()->Show();
   EXPECT_TRUE(
       controller()->AccountChooserModelForTesting()->WalletIsSelected());
   controller()->OnDidFetchWalletCookieValue(std::string());
   controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
   EXPECT_TRUE(controller()->ShouldShowAccountChooser());
   EXPECT_TRUE(
       controller()->AccountChooserModelForTesting()->WalletIsSelected());
 
+  // If US is not indicated, don't show Wallet.
   ResetControllerWithFormData(DefaultFormData());
-  controller()->GetTestingManager()->set_default_country_code("ES");
+  controller()->GetTestingManager()->set_timezone_country_code("ES");
   controller()->Show();
+  controller()->OnDidFetchWalletCookieValue(std::string());
+  controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
   EXPECT_FALSE(controller()->ShouldShowAccountChooser());
-  EXPECT_FALSE(
+
+  // If US is indicated (via a profile), show Wallet.
+  ResetControllerWithFormData(DefaultFormData());
+  controller()->GetTestingManager()->set_timezone_country_code("ES");
+  controller()->GetTestingManager()->AddTestingProfile(&us_profile);
+  controller()->Show();
+  controller()->OnDidFetchWalletCookieValue(std::string());
+  controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
+  EXPECT_TRUE(controller()->ShouldShowAccountChooser());
+  EXPECT_TRUE(
+      controller()->AccountChooserModelForTesting()->WalletIsSelected());
+
+  // Make sure the profile doesn't just override the timezone.
+  ResetControllerWithFormData(DefaultFormData());
+  controller()->GetTestingManager()->set_timezone_country_code("US");
+  controller()->GetTestingManager()->AddTestingProfile(&es_profile);
+  controller()->Show();
+  controller()->OnDidFetchWalletCookieValue(std::string());
+  controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
+  EXPECT_TRUE(controller()->ShouldShowAccountChooser());
+  EXPECT_TRUE(
+      controller()->AccountChooserModelForTesting()->WalletIsSelected());
+
+  // Only takes one US address to enable Wallet.
+  ResetControllerWithFormData(DefaultFormData());
+  controller()->GetTestingManager()->set_timezone_country_code("FR");
+  controller()->GetTestingManager()->AddTestingProfile(&es_profile);
+  controller()->GetTestingManager()->AddTestingProfile(&es_profile2);
+  controller()->GetTestingManager()->AddTestingProfile(&us_profile);
+  controller()->Show();
+  controller()->OnDidFetchWalletCookieValue(std::string());
+  controller()->OnDidGetWalletItems(CompleteAndValidWalletItems());
+  EXPECT_TRUE(controller()->ShouldShowAccountChooser());
+  EXPECT_TRUE(
       controller()->AccountChooserModelForTesting()->WalletIsSelected());
 }
 
 TEST_F(AutofillDialogControllerTest, DontGetWalletTillNecessary) {
   // When starting on local data mode, the dialog will provide a "Use Google
   // Wallet" link.
   profile()->GetPrefs()->SetBoolean(
       ::prefs::kAutofillDialogPayWithoutWallet, true);
   ResetControllerWithFormData(DefaultFormData());
   controller()->Show();
@@ skipping 110 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   for (size_t i = 0; i < arraysize(kSupportedCardIdrs); ++i) {
     SCOPED_TRACE(base::IntToString(i));
     gfx::Image supported_card_icon = rb.GetImageNamed(kSupportedCardIdrs[i]);
     EXPECT_GE(placeholder_icon.Width(), supported_card_icon.Width());
     EXPECT_GE(placeholder_icon.Height(), supported_card_icon.Height());
   }
 }
 
 }  // namespace autofill