trunk/src/chrome/browser/ui/autofill/country_combobox_model_unittest.cc - Issue 387123004: Revert 282726 "Reland "Use upstream libaddressinput in Chrome.""

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/ui/autofill/country_combobox_model_unittest.cc

Issue 387123004: Revert 282726 "Reland "Use upstream libaddressinput in Chrome."" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: trunk/src/chrome/browser/ui/autofill/country_combobox_model_unittest.cc

===================================================================

--- trunk/src/chrome/browser/ui/autofill/country_combobox_model_unittest.cc (revision 282731)

+++ trunk/src/chrome/browser/ui/autofill/country_combobox_model_unittest.cc (working copy)

@@ -10,9 +10,8 @@

#include "components/autofill/core/browser/autofill_country.h"

#include "components/autofill/core/browser/test_personal_data_manager.h"

#include "testing/gtest/include/gtest/gtest.h"

-#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui.h"

-#include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_ui_component.h"

-#include "third_party/libaddressinput/src/cpp/include/libaddressinput/localization.h"

+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui.h"

+#include "third_party/libaddressinput/chromium/cpp/include/libaddressinput/address_ui_component.h"

namespace autofill {

@@ -45,8 +44,6 @@

}

TEST_F(CountryComboboxModelTest, AllCountriesHaveComponents) {

- ::i18n::addressinput::Localization localization;

- std::string unused;

for (int i = 0; i < model()->GetItemCount(); ++i) {

if (model()->IsItemSeparatorAt(i))

continue;

@@ -54,7 +51,7 @@

std::string country_code = model()->countries()[i]->country_code();

std::vector< ::i18n::addressinput::AddressUiComponent> components =

::i18n::addressinput::BuildComponents(

- country_code, localization, std::string(), &unused);

+ country_code, std::string(), NULL);

EXPECT_FALSE(components.empty());

}