Add billing address to masked server credit cards.

Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings have a common parent and
    re-use common UI elements.

BUG=602663
Committed: https://crrev.com/31ca43a09d9883e80fdda6c504f6f2c10c5e2901
Cr-Commit-Position: refs/heads/master@{#403282}

[please use gerrit instead, 2016-06-29 15:44:38]

Description was changed from

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added a UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.

BUG=602663
==========

to

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added a UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings became the same UI in order to share
the common layouts and logic.

BUG=602663
==========

[please use gerrit instead, 2016-06-29 15:44:54]

Description was changed from

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added a UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings became the same UI in order to share
the common layouts and logic.

BUG=602663
==========

to

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added a UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings became the same UI in order to
    share the common layouts and logic.

BUG=602663
==========

[please use gerrit instead, 2016-06-29 16:22:41]

Description was changed from

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added a UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings became the same UI in order to
    share the common layouts and logic.

BUG=602663
==========

to

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings became the same UI in order to
    share the common layouts and logic.

BUG=602663
==========

[please use gerrit instead, 2016-06-29 17:20:45]

Patchset #1 (id:1) has been deleted

[please use gerrit instead, 2016-06-29 17:33:51]

Patchset #1 (id:20001) has been deleted

[please use gerrit instead, 2016-06-29 17:43:07]

Patchset #1 (id:40001) has been deleted

[please use gerrit instead, 2016-06-29 17:48:18]

rouslan@chromium.org changed reviewers:
+ dfalcantara@chromium.org, mathp@chromium.org, shess@chromium.org

[please use gerrit instead, 2016-06-29 17:48:18]

dfalcantara@, ptal android UI. Screenshots in http://crbug.com/602663#c11.

shess@, ptal components/webdata/.

mathp@, ptal components/autofill/.

[Scott Hess - ex-Googler, 2016-06-29 20:04:07]

LGTM, your option on suggestions.

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
File components/autofill/core/browser/webdata/autofill_table.cc (right):

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
components/autofill/core/browser/webdata/autofill_table.cc:1409: return false;
Don't need a transaction for a single-statement function.

Though there is a lot of support for the overall pattern, so I could see hewing
to the pattern even when it's not necessary.

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
File
components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc
(right):

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc:131:
if (saved_card->server_id().compare(server_card.server_id()) == 0) {
Would "saved_card->server_id() == server_card.server_id()" work for you?

[gone, 2016-06-29 20:09:42]

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
File chrome/android/java/res/layout/autofill_credit_card_editor.xml (right):

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:13: <!-- The
section that's shown only for server cards. -->
One big problem with jamming in the controls into one layout like this is that
it's not efficient: you're constructing a bunch of Views that you're never
actually going to show.  It also means that you end up having to remove them
later on after construction (while View.GONE can be used to hide the Views, they
still get looked at when a ViewGroup does a measure and layout pass).

One way around this that doesn't rock your CL too much is to use a ViewStub:
https://developer.android.com/reference/android/view/ViewStub.html

If you pull out the sections that are only shown for server or local cards into
other layout files, then use ViewStubs to inflate them as necessary, it'd be 
cleaner (conceptually) and a little more efficient (overall).

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:16:
android:layout_width="wrap_content"
match_parent

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:23:
android:layout_width="wrap_content"
match_parent

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:55:
<org.chromium.ui.widget.ButtonCompat
This button is just kind of floating here randomly.  I guess it can hold off
until hwi@ makes some mocks.

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:59:
android:paddingTop="@dimen/pref_autofill_field_top_padding"
Don't customize the padding of the button.  Are you trying to apply a margin?

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:61:
android:minHeight="40dp"
Don't set the minHeight; should be handled by the ButtonCompatOverlay style
already.

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java
(right):

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java:173:
mIsLocalCard = card.getIsLocal();
As mentioned in chat, I think it'd make more sense to have a base class for
Local and Server credit cards with all the common logic, then have the
subclasses deal with implementation differences.  It'd avoid having to add views
that you ultimately don't care about, and would be cleaner because the
subclasses would avoid having mIsLocalCard being checked everywhere.

That said, if you use ViewStubs like I mentioned above then you would at least
get rid of the hiding of unused elements.

If you also pull out the logic in this conditional into a
addLocalCardDataToFields/addServerCardDataToFields, I'd be alright with keeping
the classes smashed together.

https://chromiumcodereview.appspot.com/2109643003/diff/80001/chrome/android/j...
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java:235:
mServerCardLabel.setVisibility(View.GONE);
Prefer removing views you'll never use to just changing visibility.

[Mathieu, 2016-06-29 21:06:35]

browser autofill lgtm

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
File components/autofill/core/browser/webdata/autofill_webdata.h (right):

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
components/autofill/core/browser/webdata/autofill_webdata.h:120: // Updates the
billing address for a server card (maksed or not).
nit: masked

[please use gerrit instead, 2016-06-30 01:19:27]

dfalcantara@, ptal patch 2. Screenshots in http://crbug.com/602663#c22

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/res...
File chrome/android/java/res/layout/autofill_credit_card_editor.xml (right):

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/res...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:13: <!-- The
section that's shown only for server cards. -->
On 2016/06/29 20:09:41, dfalcantara wrote:
> One big problem with jamming in the controls into one layout like this is that
> it's not efficient: you're constructing a bunch of Views that you're never
> actually going to show.  It also means that you end up having to remove them
> later on after construction (while View.GONE can be used to hide the Views,
they
> still get looked at when a ViewGroup does a measure and layout pass).
> 
> One way around this that doesn't rock your CL too much is to use a ViewStub:
> https://developer.android.com/reference/android/view/ViewStub.html
> 
> If you pull out the sections that are only shown for server or local cards
into
> other layout files, then use ViewStubs to inflate them as necessary, it'd be 
> cleaner (conceptually) and a little more efficient (overall).

Layouts are split-up.

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/res...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:16:
android:layout_width="wrap_content"
On 2016/06/29 20:09:41, dfalcantara wrote:
> match_parent

Done.

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/res...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:23:
android:layout_width="wrap_content"
On 2016/06/29 20:09:42, dfalcantara wrote:
> match_parent

Done.

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/res...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:55:
<org.chromium.ui.widget.ButtonCompat
On 2016/06/29 20:09:41, dfalcantara wrote:
> This button is just kind of floating here randomly.  I guess it can hold off
> until hwi@ makes some mocks.

There was a missing label. Added it back.

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/res...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:59:
android:paddingTop="@dimen/pref_autofill_field_top_padding"
On 2016/06/29 20:09:41, dfalcantara wrote:
> Don't customize the padding of the button.  Are you trying to apply a margin?

Done.

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/res...
chrome/android/java/res/layout/autofill_credit_card_editor.xml:61:
android:minHeight="40dp"
On 2016/06/29 20:09:41, dfalcantara wrote:
> Don't set the minHeight; should be handled by the ButtonCompatOverlay style
> already.

Done.

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/src...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java
(right):

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java:173:
mIsLocalCard = card.getIsLocal();
On 2016/06/29 20:09:42, dfalcantara wrote:
> As mentioned in chat, I think it'd make more sense to have a base class for
> Local and Server credit cards with all the common logic, then have the
> subclasses deal with implementation differences.  It'd avoid having to add
views
> that you ultimately don't care about, and would be cleaner because the
> subclasses would avoid having mIsLocalCard being checked everywhere.
> 
> That said, if you use ViewStubs like I mentioned above then you would at least
> get rid of the hiding of unused elements.
> 
> If you also pull out the logic in this conditional into a
> addLocalCardDataToFields/addServerCardDataToFields, I'd be alright with
keeping
> the classes smashed together.

Separated the classes.

https://codereview.chromium.org/2109643003/diff/80001/chrome/android/java/src...
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java:235:
mServerCardLabel.setVisibility(View.GONE);
On 2016/06/29 20:09:42, dfalcantara wrote:
> Prefer removing views you'll never use to just changing visibility.

Switched to removing views.

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
File components/autofill/core/browser/webdata/autofill_table.cc (right):

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
components/autofill/core/browser/webdata/autofill_table.cc:1409: return false;
On 2016/06/29 20:04:07, Scott Hess (OOO Jul 1-Aug 7) wrote:
> Don't need a transaction for a single-statement function.
> 
> Though there is a lot of support for the overall pattern, so I could see
hewing
> to the pattern even when it's not necessary.

Removed the transaction.

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
File
components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc
(right):

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
components/autofill/core/browser/webdata/autofill_wallet_syncable_service.cc:131:
if (saved_card->server_id().compare(server_card.server_id()) == 0) {
On 2016/06/29 20:04:07, Scott Hess (OOO Jul 1-Aug 7) wrote:
> Would "saved_card->server_id() == server_card.server_id()" work for you?

Good point. That works as well, is shorter, and is easier to read.

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
File components/autofill/core/browser/webdata/autofill_webdata.h (right):

https://codereview.chromium.org/2109643003/diff/80001/components/autofill/cor...
components/autofill/core/browser/webdata/autofill_webdata.h:120: // Updates the
billing address for a server card (maksed or not).
On 2016/06/29 21:06:35, Mathieu Perreault wrote:
> nit: masked

Done.

[please use gerrit instead, 2016-06-30 01:51:21]

Description was changed from

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings became the same UI in order to
    share the common layouts and logic.

BUG=602663
==========

to

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings have a common parent and
    re-use common UI elements.

BUG=602663
==========

[Scott Hess - ex-Googler, 2016-06-30 06:00:35]

still lgtm.

[gone, 2016-06-30 17:26:37]

lgtm % question about TextViewWithClickableSpans

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
File chrome/android/java/res/layout/autofill_local_card_editor.xml (right):

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
chrome/android/java/res/layout/autofill_local_card_editor.xml:20:
android:hint="@string/autofill_credit_card_editor_name"/>
I've generally seen the space kept when you have the /> self-closing tag, but
removed when it not self-closing.

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
File chrome/android/java/res/layout/autofill_server_card_editor.xml (right):

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
chrome/android/java/res/layout/autofill_server_card_editor.xml:31:
android:layout_alignParentEnd="true"
should add an android:layout_alignParentTop="true" here too for clarity

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
chrome/android/java/res/layout/autofill_server_card_editor.xml:50:
<org.chromium.ui.widget.TextViewWithClickableSpans
why are you using TextViewWithClickableSpans?  you're not setting Spans
anywhere, afaict.  do plain TextViews work?

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
chrome/android/java/res/layout/autofill_server_card_editor.xml:63:
<org.chromium.ui.widget.TextViewWithClickableSpans
ditto.

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/sr...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java
(right):

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/sr...
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java:41:
noSelection.setLabel(getActivity().getString(
nit: I'd prefer to keep this on the same line as the R.string.autofill blah. 
looks cleaner.  up to you.

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/sr...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java
(right):

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/sr...
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java:58:
});
I'd line up the }); with the start of mClearLocalCopy instead of indenting it by
4; you're supposed to indent by 8 for overflows but that looks weird here (and
the other places you do it).

[please use gerrit instead, 2016-06-30 18:36:27]

Comments addressed. Sending to cq.

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
File chrome/android/java/res/layout/autofill_local_card_editor.xml (right):

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
chrome/android/java/res/layout/autofill_local_card_editor.xml:20:
android:hint="@string/autofill_credit_card_editor_name"/>
On 2016/06/30 17:26:36, dfalcantara wrote:
> I've generally seen the space kept when you have the /> self-closing tag, but
> removed when it not self-closing.

Done.

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
File chrome/android/java/res/layout/autofill_server_card_editor.xml (right):

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
chrome/android/java/res/layout/autofill_server_card_editor.xml:50:
<org.chromium.ui.widget.TextViewWithClickableSpans
On 2016/06/30 17:26:37, dfalcantara wrote:
> why are you using TextViewWithClickableSpans?  you're not setting Spans
> anywhere, afaict.  do plain TextViews work?

Done.

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/re...
chrome/android/java/res/layout/autofill_server_card_editor.xml:63:
<org.chromium.ui.widget.TextViewWithClickableSpans
On 2016/06/30 17:26:37, dfalcantara wrote:
> ditto.

Done.

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/sr...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java
(right):

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/sr...
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillCreditCardEditor.java:41:
noSelection.setLabel(getActivity().getString(
On 2016/06/30 17:26:37, dfalcantara wrote:
> nit: I'd prefer to keep this on the same line as the R.string.autofill blah. 
> looks cleaner.  up to you.

Done.

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/sr...
File
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java
(right):

https://codereview.chromium.org/2109643003/diff/120001/chrome/android/java/sr...
chrome/android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillServerCardEditor.java:58:
});
On 2016/06/30 17:26:37, dfalcantara wrote:
> I'd line up the }); with the start of mClearLocalCopy instead of indenting it
by
> 4; you're supposed to indent by 8 for overflows but that looks weird here (and
> the other places you do it).

Done.

[please use gerrit instead, 2016-06-30 18:36:33]

The CQ bit was checked by rouslan@chromium.org

[please use gerrit instead, 2016-06-30 18:36:34]

The patchset sent to the CQ was uploaded after l-g-t-m from mathp@chromium.org,
dfalcantara@chromium.org, shess@chromium.org
Link to the patchset: https://codereview.chromium.org/2109643003/#ps140001
(title: "Address dfalcantara@'s comments")

[commit-bot: I haz the power, 2016-06-30 18:37:00]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-30 19:34:43]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2016-06-30 19:34:44]

Try jobs failed on following builders:
  ios-simulator-gn on master.tryserver.chromium.mac (JOB_FAILED,
http://build.chromium.org/p/tryserver.chromium.mac/builders/ios-simulator-gn/...)

[please use gerrit instead, 2016-06-30 19:50:58]

Description was changed from

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings have a common parent and
    re-use common UI elements.

BUG=602663
==========

to

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings have a common parent and
    re-use common UI elements.

BUG=602663
==========

[please use gerrit instead, 2016-06-30 19:51:52]

shess@: Any idea why the iOS cannot find the version_66.sql file?

[ RUN      ] WebDatabaseMigrationTest.VersionXxSqlFilesAreGolden
../../components/webdata/common/web_database_migration_unittest.cc:138: Failure
Value of: GetWebDatabaseData(base::FilePath(file), &contents)
  Actual: false
Expected: true
../../components/webdata/common/web_database_migration_unittest.cc:164: Failure
Expected: LoadDatabase(file_name.value()) doesn't generate new fatal failures in
the current thread.
  Actual: it does.
Failed to load version_66.sql

groby@: jdonnelly@ is ooo today. Is there another iOS expert to whom I can reach
out?

[please use gerrit instead, 2016-06-30 19:55:48]

Nevermind, found the problem. Forgot to add version_66.sql to the build file,
which is used only on iOS, it seems. Fixed and sending to cq.

[please use gerrit instead, 2016-06-30 19:56:28]

The CQ bit was checked by rouslan@chromium.org

[please use gerrit instead, 2016-06-30 19:56:29]

The patchset sent to the CQ was uploaded after l-g-t-m from mathp@chromium.org,
dfalcantara@chromium.org, shess@chromium.org
Link to the patchset: https://codereview.chromium.org/2109643003/#ps160001
(title: "Add version_66.sql to the build file.")

[commit-bot: I haz the power, 2016-06-30 19:57:10]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-06-30 21:03:51]

Description was changed from

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings have a common parent and
    re-use common UI elements.

BUG=602663
==========

to

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings have a common parent and
    re-use common UI elements.

BUG=602663
==========

[commit-bot: I haz the power, 2016-06-30 21:03:52]

Committed patchset #6 (id:160001)

[commit-bot: I haz the power, 2016-06-30 21:04:16]

CQ bit was unchecked.

[commit-bot: I haz the power, 2016-06-30 21:05:05]

Description was changed from

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings have a common parent and
    re-use common UI elements.

BUG=602663
==========

to

==========
Add billing address to masked server credit cards.

Autofill table:
  * Added billing_address_id column to masked_credit_card table.
  * Bumped version to 67.

Sync:
  * Do not overwrite user's preferred billing address for their server
    card when downloading masked credit cards from the server.

Personal data manager:
  * Added an UpdateServerCreditCardBillingAddress() method to support
    changes from settings.

Android autofill settings:
  * Let users change the billing address of their server credit card.
  * Local and server credit card settings have a common parent and
    re-use common UI elements.

BUG=602663

Committed: https://crrev.com/31ca43a09d9883e80fdda6c504f6f2c10c5e2901
Cr-Commit-Position: refs/heads/master@{#403282}
==========

[commit-bot: I haz the power, 2016-06-30 21:05:07]

Patchset 6 (id:??) landed as
https://crrev.com/31ca43a09d9883e80fdda6c504f6f2c10c5e2901
Cr-Commit-Position: refs/heads/master@{#403282}