Fix credit card table migration step.

Fix credit card table migration step by ensuring that we're not trying to add a column which is already present.  If we create a table as part of the init process, don't try to alter the table, because it already exists.

BUG=10913
TEST= search engine dialog works, search engines don't disappear.  SPECIFICALLY: create a profile (user data dir, etc.) using a build from *before* r37036 on trunk.  Add search engines to the profile.  Then run the newest version of Chrome, using the same profile.  Search engines should not go away.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=57902

[sky, 2010-08-30 16:09:30]

http://codereview.chromium.org/3239006/diff/6001/7001
File chrome/browser/webdata/web_database.cc (right):

http://codereview.chromium.org/3239006/diff/6001/7001#newcode397
chrome/browser/webdata/web_database.cc:397: : credit_cards_table_created_(false)
{
Can we make this a local variable to Init that gets passed into
MigrateOldVersionsAsNeeded.

Also, can you add a unit test?

[Miranda Callahan, 2010-08-30 20:21:07]

Unit test coming when I can think straight.  Thanks for all your help!

http://codereview.chromium.org/3239006/diff/6001/7001
File chrome/browser/webdata/web_database.cc (right):

http://codereview.chromium.org/3239006/diff/6001/7001#newcode397
chrome/browser/webdata/web_database.cc:397: : credit_cards_table_created_(false)
{
On 2010/08/30 16:09:30, sky wrote:
> Can we make this a local variable to Init that gets passed into
> MigrateOldVersionsAsNeeded.
> 
> Also, can you add a unit test?

Done.

[sky, 2010-08-30 20:28:15]

LGTM with the following changes.

http://codereview.chromium.org/3239006/diff/9002/16001
File chrome/browser/webdata/web_database.cc (right):

http://codereview.chromium.org/3239006/diff/9002/16001#newcode781
chrome/browser/webdata/web_database.cc:781: } else {
There's no point in an else here because of the return on 780.

http://codereview.chromium.org/3239006/diff/9002/16002
File chrome/browser/webdata/web_database.h (right):

http://codereview.chromium.org/3239006/diff/9002/16002#newcode333
chrome/browser/webdata/web_database.h:333: bool InitCreditCardsTable(bool&
table_was_created);
bool* (style guide only allows references when const).

[Miranda Callahan, 2010-08-30 20:41:39]

Scott, I know you LGTMed, but please look again because I don't trust my tired
self.

http://codereview.chromium.org/3239006/diff/9002/16001
File chrome/browser/webdata/web_database.cc (right):

http://codereview.chromium.org/3239006/diff/9002/16001#newcode781
chrome/browser/webdata/web_database.cc:781: } else {
On 2010/08/30 20:28:15, sky wrote:
> There's no point in an else here because of the return on 780.

Done.

http://codereview.chromium.org/3239006/diff/9002/16002
File chrome/browser/webdata/web_database.h (right):

http://codereview.chromium.org/3239006/diff/9002/16002#newcode333
chrome/browser/webdata/web_database.h:333: bool InitCreditCardsTable(bool&
table_was_created);
On 2010/08/30 20:28:15, sky wrote:
> bool* (style guide only allows references when const).

Done.

[sky, 2010-08-30 20:47:51]

LGTM