libmojo: Uprev the library to r456626 from Chromium
Pulled the latest and greatest version of libmojo from Chromium.
The merge was done against r456626 which corresponds to git commit
08266b3fca707804065a2cfd60331722ade41969 of Mar 14, 2017
Notable changes are:
- generated binding files are now split in 2 files, interface.mojom.h
and interface.mojom-shared.h
Change-Id: Idcfd27310e2c9d3c452b671c7ff7a755c3963618
diff --git a/mojo/common/data_pipe_utils.cc b/mojo/common/data_pipe_utils.cc
index 8540ac6..bed5e85 100644
--- a/mojo/common/data_pipe_utils.cc
+++ b/mojo/common/data_pipe_utils.cc
@@ -4,16 +4,9 @@
#include "mojo/common/data_pipe_utils.h"
-#include <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
#include <utility>
-#include "base/files/file_path.h"
-#include "base/files/file_util.h"
-#include "base/files/scoped_file.h"
-#include "base/message_loop/message_loop.h"
-#include "base/task_runner_util.h"
+#include "base/bind.h"
namespace mojo {
namespace common {
@@ -58,12 +51,7 @@
return num_bytes;
}
-size_t CopyToFileHelper(FILE* fp, const void* buffer, uint32_t num_bytes) {
- return fwrite(buffer, 1, num_bytes, fp);
-}
-
-} // namespace
-
+} // namespace
// TODO(hansmuller): Add a max_size parameter.
bool BlockingCopyToString(ScopedDataPipeConsumerHandle source,
@@ -107,25 +95,5 @@
}
}
-bool BlockingCopyToFile(ScopedDataPipeConsumerHandle source,
- const base::FilePath& destination) {
- base::ScopedFILE fp(base::OpenFile(destination, "wb"));
- if (!fp)
- return false;
- return BlockingCopyHelper(std::move(source),
- base::Bind(&CopyToFileHelper, fp.get()));
-}
-
-void CopyToFile(ScopedDataPipeConsumerHandle source,
- const base::FilePath& destination,
- base::TaskRunner* task_runner,
- const base::Callback<void(bool)>& callback) {
- base::PostTaskAndReplyWithResult(
- task_runner,
- FROM_HERE,
- base::Bind(&BlockingCopyToFile, base::Passed(&source), destination),
- callback);
-}
-
} // namespace common
} // namespace mojo