Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1773)

Unified Diff: chrome/browser/performance_monitor/database.cc

Issue 12314090: Add utf_string_conversions to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/password_manager/password_store_x_unittest.cc ('k') | chrome/browser/platform_util_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/performance_monitor/database.cc
diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc
index de813f31b9dad9ad4adc029b713c80138d636b39..40fc57d088cdd30aa1ab902c3e1c116afe9a8eae 100644
--- a/chrome/browser/performance_monitor/database.cc
+++ b/chrome/browser/performance_monitor/database.cc
@@ -458,24 +458,28 @@ void Database::InitDBs() {
event_db_ = scoped_ptr<leveldb::DB>(new_db);
#elif defined(OS_WIN)
leveldb::DB::Open(open_options,
- WideToUTF8(path_.AppendASCII(kRecentDb).value()), &new_db);
+ base::WideToUTF8(path_.AppendASCII(kRecentDb).value()),
+ &new_db);
recent_db_ = scoped_ptr<leveldb::DB>(new_db);
leveldb::DB::Open(open_options,
- WideToUTF8(path_.AppendASCII(kMaxValueDb).value()),
+ base::WideToUTF8(path_.AppendASCII(kMaxValueDb).value()),
&new_db);
max_value_db_ = scoped_ptr<leveldb::DB>(new_db);
leveldb::DB::Open(open_options,
- WideToUTF8(path_.AppendASCII(kStateDb).value()), &new_db);
+ base::WideToUTF8(path_.AppendASCII(kStateDb).value()),
+ &new_db);
state_db_ = scoped_ptr<leveldb::DB>(new_db);
leveldb::DB::Open(open_options,
- WideToUTF8(path_.AppendASCII(kActiveIntervalDb).value()),
- &new_db);
+ base::WideToUTF8(path_.AppendASCII(kActiveIntervalDb).value()),
+ &new_db);
active_interval_db_ = scoped_ptr<leveldb::DB>(new_db);
leveldb::DB::Open(open_options,
- WideToUTF8(path_.AppendASCII(kMetricDb).value()), &new_db);
+ base::WideToUTF8(path_.AppendASCII(kMetricDb).value()),
+ &new_db);
metric_db_ = scoped_ptr<leveldb::DB>(new_db);
leveldb::DB::Open(open_options,
- WideToUTF8(path_.AppendASCII(kEventDb).value()), &new_db);
+ base::WideToUTF8(path_.AppendASCII(kEventDb).value()),
+ &new_db);
event_db_ = scoped_ptr<leveldb::DB>(new_db);
#endif
}
« no previous file with comments | « chrome/browser/password_manager/password_store_x_unittest.cc ('k') | chrome/browser/platform_util_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698