diff options
| -rw-r--r-- | chrome/browser/metrics_log.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/metrics_service.cc | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/chrome/browser/metrics_log.cc b/chrome/browser/metrics_log.cc index 5efcb47..24e94e5 100644 --- a/chrome/browser/metrics_log.cc +++ b/chrome/browser/metrics_log.cc @@ -576,11 +576,11 @@ void MetricsLog::WriteProfileMetrics(const std::wstring& profileidhash, DCHECK(*i != L"id"); switch (value->GetType()) { case Value::TYPE_STRING: { - std::wstring string_value; + std::string string_value; if (value->GetAsString(&string_value)) { OPEN_ELEMENT_FOR_SCOPE("profileparam"); WriteAttribute("name", WideToUTF8(*i)); - WriteAttribute("value", WideToUTF8(string_value)); + WriteAttribute("value", string_value); } break; } diff --git a/chrome/browser/metrics_service.cc b/chrome/browser/metrics_service.cc index 7a022fa..ec374de 100644 --- a/chrome/browser/metrics_service.cc +++ b/chrome/browser/metrics_service.cc @@ -984,18 +984,18 @@ void MetricsService::RecallUnsentLogs() { prefs::kMetricsInitialLogs); for (ListValue::iterator it = unsent_initial_logs->begin(); it != unsent_initial_logs->end(); ++it) { - std::wstring wide_log; - (*it)->GetAsString(&wide_log); - unsent_initial_logs_.push_back(WideToUTF8(wide_log)); + std::string log; + (*it)->GetAsString(&log); + unsent_initial_logs_.push_back(log); } ListValue* unsent_ongoing_logs = local_state->GetMutableList( prefs::kMetricsOngoingLogs); for (ListValue::iterator it = unsent_ongoing_logs->begin(); it != unsent_ongoing_logs->end(); ++it) { - std::wstring wide_log; - (*it)->GetAsString(&wide_log); - unsent_ongoing_logs_.push_back(WideToUTF8(wide_log)); + std::string log; + (*it)->GetAsString(&log); + unsent_ongoing_logs_.push_back(log); } } @@ -1014,7 +1014,7 @@ void MetricsService::StoreUnsentLogs() { start = unsent_initial_logs_.size() - kMaxInitialLogsPersisted; for (size_t i = start; i < unsent_initial_logs_.size(); ++i) unsent_initial_logs->Append( - Value::CreateStringValue(UTF8ToWide(unsent_initial_logs_[i]))); + Value::CreateStringValue(unsent_initial_logs_[i])); ListValue* unsent_ongoing_logs = local_state->GetMutableList( prefs::kMetricsOngoingLogs); @@ -1024,7 +1024,7 @@ void MetricsService::StoreUnsentLogs() { start = unsent_ongoing_logs_.size() - kMaxOngoingLogsPersisted; for (size_t i = start; i < unsent_ongoing_logs_.size(); ++i) unsent_ongoing_logs->Append( - Value::CreateStringValue(UTF8ToWide(unsent_ongoing_logs_[i]))); + Value::CreateStringValue(unsent_ongoing_logs_[i])); } void MetricsService::PreparePendingLogText() { |