summaryrefslogtreecommitdiffstats
path: root/chrome/browser/performance_monitor/database.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-24 20:27:04 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-24 20:27:04 +0000
commit5f0cebb46d66ef0a1996594d0846c0067a8cf475 (patch)
tree5b3204961a403e7396fe48b45930b5b6528839f0 /chrome/browser/performance_monitor/database.cc
parent20023a76c3ffa049c35f86263fbf6ee4bbf00ade (diff)
downloadchromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.zip
chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.gz
chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.bz2
Add utf_string_conversions to base namespace.
This adds "using"s for all functions so those can be fixed in a separate pass. This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover. BUG= Review URL: https://codereview.chromium.org/12314090 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/performance_monitor/database.cc')
-rw-r--r--chrome/browser/performance_monitor/database.cc18
1 files changed, 11 insertions, 7 deletions
diff --git a/chrome/browser/performance_monitor/database.cc b/chrome/browser/performance_monitor/database.cc
index de813f3..40fc57d 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
}