Use %ls instead of %s in wprintf format strings for wchar_t fields.

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@846 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
index ec6f671..bb817df 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc
@@ -51,13 +51,13 @@
 // diagnostic page.
 // TODO(paulg): Change 'googleclient' to a proper client name before launch.
 static const char* const kSbDiagnosticUrl =
-    "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?site=%s&client=googleclient";
+    "http://safebrowsing.clients.google.com/safebrowsing/diagnostic?site=%ls&client=googleclient";
 
 static const char* const kSbReportPhishingUrl =
     "http://www.google.com/safebrowsing/report_error/";
 
 static const wchar_t* const kSbDiagnosticHtml =
-    L"<a href=\"\" onClick=\"sendCommand(4); return false;\">%s</a>";
+    L"<a href=\"\" onClick=\"sendCommand(4); return false;\">%ls</a>";
 
 // Created on the io_thread.
 SafeBrowsingBlockingPage::SafeBrowsingBlockingPage(
diff --git a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
index b4a05952..41adebc 100644
--- a/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_database_unittest.cc
@@ -477,7 +477,7 @@ TEST(SafeBrowsing, HashCaching) {
 
 void PrintStat(const wchar_t* name) {
   int value = StatsTable::current()->GetCounterValue(name);
-  std::wstring out = StringPrintf(L"%s %d\r\n", name, value);
+  std::wstring out = StringPrintf(L"%ls %d\r\n", name, value);
   OutputDebugStringW(out.c_str());
 }
 
@@ -650,4 +650,4 @@ TEST(SafeBrowsing, DISABLED_DatabaseOldLotsofDeletesIO) {
   del.chunk_del.push_back(ChunkRange(3539, 3579));
   deletes->push_back(del);
   PeformUpdate(L"old\\SafeBrowsing", chunks, deletes);
-}
\ No newline at end of file
+}