summaryrefslogtreecommitdiffstats
path: root/chrome/browser/webdata
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/webdata')
-rw-r--r--chrome/browser/webdata/keyword_table.cc4
-rw-r--r--chrome/browser/webdata/token_service_table_unittest.cc2
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc
index 956d60b..10d224e 100644
--- a/chrome/browser/webdata/keyword_table.cc
+++ b/chrome/browser/webdata/keyword_table.cc
@@ -388,7 +388,7 @@ bool KeywordTable::MigrateToVersion45RemoveLogoIDAndAutogenerateColumns() {
// Migrate the keywords backup table as well.
if (!MigrateKeywordsTableForVersion45("keywords_backup") ||
!meta_table_->SetValue("Default Search Provider ID Backup Signature",
- ""))
+ std::string()))
return false;
return transaction.Commit();
@@ -409,7 +409,7 @@ bool KeywordTable::MigrateToVersion47AddAlternateURLsColumn() {
if (!db_->Execute("ALTER TABLE keywords_backup ADD COLUMN "
"alternate_urls VARCHAR DEFAULT ''") ||
!meta_table_->SetValue("Default Search Provider ID Backup Signature",
- ""))
+ std::string()))
return false;
return transaction.Commit();
diff --git a/chrome/browser/webdata/token_service_table_unittest.cc b/chrome/browser/webdata/token_service_table_unittest.cc
index db409f8..3c60ccf 100644
--- a/chrome/browser/webdata/token_service_table_unittest.cc
+++ b/chrome/browser/webdata/token_service_table_unittest.cc
@@ -89,7 +89,7 @@ TEST_F(TokenServiceTableTest, MAYBE_TokenServiceGetSet) {
out_map.clear();
// try blanking it - won't remove it from the db though!
- EXPECT_TRUE(table_->SetTokenForService(service, ""));
+ EXPECT_TRUE(table_->SetTokenForService(service, std::string()));
EXPECT_TRUE(table_->GetAllTokens(&out_map));
EXPECT_EQ(out_map.find(service)->second, "");
out_map.clear();