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

Unified Diff: components/leveldb/env_mojo.cc

Issue 2492283002: Mojo C++ bindings: switch components/filesystem mojom target to use STL types. (Closed)
Patch Set: Created 4 years, 1 month 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 | « components/filesystem/util.cc ('k') | components/leveldb/leveldb_mojo_proxy.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/leveldb/env_mojo.cc
diff --git a/components/leveldb/env_mojo.cc b/components/leveldb/env_mojo.cc
index b226ce4df9952fee668609fdcabade8d4d544ac5..3a2f839758da54c7ca0a4c671ddd7d8c5cd0bfbd 100644
--- a/components/leveldb/env_mojo.cc
+++ b/components/leveldb/env_mojo.cc
@@ -229,8 +229,7 @@ Status MojoEnv::NewSequentialFile(const std::string& fname,
SequentialFile** result) {
TRACE_EVENT1("leveldb", "MojoEnv::NewSequentialFile", "fname", fname);
base::File f = thread_->OpenFileHandle(
- dir_, mojo::String::From(fname),
- filesystem::mojom::kFlagOpen | filesystem::mojom::kFlagRead);
+ dir_, fname, filesystem::mojom::kFlagOpen | filesystem::mojom::kFlagRead);
if (!f.IsValid()) {
*result = nullptr;
return MakeIOError(fname, "Unable to create sequential file",
@@ -245,8 +244,7 @@ Status MojoEnv::NewRandomAccessFile(const std::string& fname,
RandomAccessFile** result) {
TRACE_EVENT1("leveldb", "MojoEnv::NewRandomAccessFile", "fname", fname);
base::File f = thread_->OpenFileHandle(
- dir_, mojo::String::From(fname),
- filesystem::mojom::kFlagRead | filesystem::mojom::kFlagOpen);
+ dir_, fname, filesystem::mojom::kFlagRead | filesystem::mojom::kFlagOpen);
if (!f.IsValid()) {
*result = nullptr;
base::File::Error error_code = f.error_details();
@@ -261,9 +259,9 @@ Status MojoEnv::NewRandomAccessFile(const std::string& fname,
Status MojoEnv::NewWritableFile(const std::string& fname,
WritableFile** result) {
TRACE_EVENT1("leveldb", "MojoEnv::NewWritableFile", "fname", fname);
- base::File f = thread_->OpenFileHandle(
- dir_, mojo::String::From(fname),
- filesystem::mojom::kCreateAlways | filesystem::mojom::kFlagWrite);
+ base::File f =
+ thread_->OpenFileHandle(dir_, fname, filesystem::mojom::kCreateAlways |
+ filesystem::mojom::kFlagWrite);
if (!f.IsValid()) {
*result = nullptr;
return MakeIOError(fname, "Unable to create writable file",
@@ -277,9 +275,9 @@ Status MojoEnv::NewWritableFile(const std::string& fname,
Status MojoEnv::NewAppendableFile(const std::string& fname,
WritableFile** result) {
TRACE_EVENT1("leveldb", "MojoEnv::NewAppendableFile", "fname", fname);
- base::File f = thread_->OpenFileHandle(
- dir_, mojo::String::From(fname),
- filesystem::mojom::kFlagOpenAlways | filesystem::mojom::kFlagAppend);
+ base::File f =
+ thread_->OpenFileHandle(dir_, fname, filesystem::mojom::kFlagOpenAlways |
+ filesystem::mojom::kFlagAppend);
if (!f.IsValid()) {
*result = nullptr;
return MakeIOError(fname, "Unable to create appendable file",
@@ -338,7 +336,7 @@ Status MojoEnv::LockFile(const std::string& fname, FileLock** lock) {
TRACE_EVENT1("leveldb", "MojoEnv::LockFile", "fname", fname);
std::pair<filesystem::mojom::FileError, LevelDBMojoProxy::OpaqueLock*> p =
- thread_->LockFile(dir_, mojo::String::From(fname));
+ thread_->LockFile(dir_, fname);
if (p.second)
*lock = new MojoFileLock(p.second, fname);
@@ -370,7 +368,7 @@ Status MojoEnv::GetTestDirectory(std::string* path) {
Status MojoEnv::NewLogger(const std::string& fname, Logger** result) {
TRACE_EVENT1("leveldb", "MojoEnv::NewLogger", "fname", fname);
base::File f(thread_->OpenFileHandle(
- dir_, mojo::String::From(fname),
+ dir_, fname,
filesystem::mojom::kCreateAlways | filesystem::mojom::kFlagWrite));
if (!f.IsValid()) {
*result = NULL;
« no previous file with comments | « components/filesystem/util.cc ('k') | components/leveldb/leveldb_mojo_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698