Remove WithBaseSyncPrimitives() from storage/browser/blob/.
The WithBaseSyncPrimitives() trait is deprecated.
ScopedAllowBaseSyncPrimitives(ForTesting|OutsideBlockingScope)
should be used instead.
Bug: 766678
Change-Id: I752e53d44d36eb5c6316a83e0f330472ed013b5f
Reviewed-on: https://chromium-review.googlesource.com/703479
Reviewed-by: Kinuko Yasuda <[email protected]>
Commit-Queue: François Doray <[email protected]>
Cr-Commit-Position: refs/heads/master@{#507742}diff --git a/storage/browser/blob/blob_registry_impl_unittest.cc b/storage/browser/blob/blob_registry_impl_unittest.cc
index 9ba6384..8dce82e 100644
--- a/storage/browser/blob/blob_registry_impl_unittest.cc
+++ b/storage/browser/blob/blob_registry_impl_unittest.cc
@@ -173,8 +173,8 @@
mojom::BytesProviderPtr CreateBytesProvider(const std::string& bytes) {
if (!bytes_provider_runner_) {
- bytes_provider_runner_ = base::CreateSequencedTaskRunnerWithTraits(
- {base::MayBlock(), base::WithBaseSyncPrimitives()});
+ bytes_provider_runner_ =
+ base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()});
}
mojom::BytesProviderPtr result;
auto provider = base::MakeUnique<MockBytesProvider>(
@@ -189,8 +189,8 @@
void CreateBytesProvider(const std::string& bytes,
mojom::BytesProviderRequest request) {
if (!bytes_provider_runner_) {
- bytes_provider_runner_ = base::CreateSequencedTaskRunnerWithTraits(
- {base::MayBlock(), base::WithBaseSyncPrimitives()});
+ bytes_provider_runner_ =
+ base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()});
}
auto provider = base::MakeUnique<MockBytesProvider>(
std::vector<uint8_t>(bytes.begin(), bytes.end()), &reply_request_count_,
diff --git a/storage/browser/blob/blob_transport_strategy_unittest.cc b/storage/browser/blob/blob_transport_strategy_unittest.cc
index d876403..2440d42 100644
--- a/storage/browser/blob/blob_transport_strategy_unittest.cc
+++ b/storage/browser/blob/blob_transport_strategy_unittest.cc
@@ -45,8 +45,8 @@
void SetUp() override {
ASSERT_TRUE(data_dir_.CreateUniqueTempDir());
- bytes_provider_runner_ = base::CreateSequencedTaskRunnerWithTraits(
- {base::MayBlock(), base::WithBaseSyncPrimitives()});
+ bytes_provider_runner_ =
+ base::CreateSequencedTaskRunnerWithTraits({base::MayBlock()});
mock_time_ = base::Time::Now();
limits_.max_ipc_memory_size = kTestBlobStorageIPCThresholdBytes;
diff --git a/storage/browser/test/mock_bytes_provider.cc b/storage/browser/test/mock_bytes_provider.cc
index 80de185..1af723e5 100644
--- a/storage/browser/test/mock_bytes_provider.cc
+++ b/storage/browser/test/mock_bytes_provider.cc
@@ -4,6 +4,7 @@
#include "storage/browser/test/mock_bytes_provider.h"
+#include "base/threading/thread_restrictions.h"
#include "mojo/common/data_pipe_utils.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -33,6 +34,7 @@
mojo::ScopedDataPipeProducerHandle pipe) {
if (stream_request_count_)
++*stream_request_count_;
+ base::ScopedAllowBaseSyncPrimitivesForTesting allow_base_sync_primitives;
mojo::common::BlockingCopyFromString(
std::string(reinterpret_cast<const char*>(data_.data()), data_.size()),
pipe);
