Fix the Windows build.

TEST=it compiles
BUG=none

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

2 files changed, 7 insertions, 5 deletions

diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index 9e2c87c..b0e0e6c 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -592,13 +592,15 @@ bool DecodeImportParams(const std::wstring& encoded,
   if (v.size() != 3)
     return false;
 
-  if (!base::StringToInt(v[0], browser_type))
+  if (!base::StringToInt(WideToUTF16Hack(v[0]), browser_type))
     return false;
 
-  if (!base::StringToInt(v[1], options))
+  if (!base::StringToInt(WideToUTF16Hack(v[1]), options))
     return false;
 
-  *window = reinterpret_cast<HWND>(base::StringToInt64(v[2]));
+  int64 window_int;
+  base::StringToInt64(WideToUTF16Hack(v[2]), &window_int);
+  *window = reinterpret_cast<HWND>(window_int);
   return true;
 }
 
diff --git a/chrome/browser/views/autofill_profiles_view_win.cc b/chrome/browser/views/autofill_profiles_view_win.cc
index 7b05966..f902aa6 100644
--- a/chrome/browser/views/autofill_profiles_view_win.cc
+++ b/chrome/browser/views/autofill_profiles_view_win.cc
@@ -1050,8 +1050,8 @@ void AutoFillProfilesView::EditableSetViewContents::InitCreditCardFields(
   combo_box_billing_ = new views::Combobox(billing_model_);
   combo_box_billing_->set_listener(this);
   int billing_id = -1;
-  if (base::StringToInt(temporary_info_.credit_card.billing_address(),
-                        &billing_id))
+  if (base::StringToInt(WideToUTF16Hack(
+          temporary_info_.credit_card.billing_address()), &billing_id))
     combo_box_billing_->SetSelectedItem(billing_model_->GetIndex(billing_id));
   billing_model_->UsedWithComboBox(combo_box_billing_);