| Index: chrome/utility/importer/safari_importer.mm
|
| diff --git a/chrome/utility/importer/safari_importer.mm b/chrome/utility/importer/safari_importer.mm
|
| index 480eedd5301015284cb6c9fd5222ed2a4c5fe50b..e6fa2d739c38be6b26a6dbe028553edb3b99d71b 100644
|
| --- a/chrome/utility/importer/safari_importer.mm
|
| +++ b/chrome/utility/importer/safari_importer.mm
|
| @@ -120,7 +120,7 @@ bool SafariImporter::OpenDatabase(sql::Connection* db) {
|
|
|
| void SafariImporter::ImportFaviconURLs(sql::Connection* db,
|
| FaviconMap* favicon_map) {
|
| - const char* query = "SELECT iconID, url FROM PageURL;";
|
| + const char query[] = "SELECT iconID, url FROM PageURL;";
|
| sql::Statement s(db->GetUniqueStatement(query));
|
|
|
| while (s.Step() && !cancelled()) {
|
| @@ -134,10 +134,10 @@ void SafariImporter::LoadFaviconData(
|
| sql::Connection* db,
|
| const FaviconMap& favicon_map,
|
| std::vector<ImportedFaviconUsage>* favicons) {
|
| - const char* query = "SELECT i.url, d.data "
|
| - "FROM IconInfo i JOIN IconData d "
|
| - "ON i.iconID = d.iconID "
|
| - "WHERE i.iconID = ?;";
|
| + const char query[] = "SELECT i.url, d.data "
|
| + "FROM IconInfo i JOIN IconData d "
|
| + "ON i.iconID = d.iconID "
|
| + "WHERE i.iconID = ?;";
|
| sql::Statement s(db->GetUniqueStatement(query));
|
|
|
| for (FaviconMap::const_iterator i = favicon_map.begin();
|
|
|