diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/third_party/blink/renderer/core/fileapi/public_url_manager_test.cc | |
parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/blink/renderer/core/fileapi/public_url_manager_test.cc')
-rw-r--r-- | chromium/third_party/blink/renderer/core/fileapi/public_url_manager_test.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/third_party/blink/renderer/core/fileapi/public_url_manager_test.cc b/chromium/third_party/blink/renderer/core/fileapi/public_url_manager_test.cc index 7e2a27d1284..ff8c275f0de 100644 --- a/chromium/third_party/blink/renderer/core/fileapi/public_url_manager_test.cc +++ b/chromium/third_party/blink/renderer/core/fileapi/public_url_manager_test.cc @@ -4,9 +4,11 @@ #include "third_party/blink/renderer/core/fileapi/public_url_manager.h" +#include "base/test/scoped_feature_list.h" #include "mojo/public/cpp/bindings/associated_binding.h" #include "mojo/public/cpp/bindings/strong_binding.h" #include "testing/gtest/include/gtest/gtest.h" +#include "third_party/blink/public/common/features.h" #include "third_party/blink/renderer/core/fileapi/url_registry.h" #include "third_party/blink/renderer/core/testing/null_execution_context.h" #include "third_party/blink/renderer/platform/blob/testing/fake_blob.h" @@ -67,6 +69,8 @@ class PublicURLManagerTest : public testing::Test { PublicURLManagerTest() : url_store_binding_(&url_store_) {} void SetUp() override { + scoped_feature_list_.InitAndEnableFeature(features::kMojoBlobURLs); + execution_context_ = new NullExecutionContext; // By default this creates a unique origin, which is exactly what this test // wants. @@ -90,7 +94,7 @@ class PublicURLManagerTest : public testing::Test { } protected: - ScopedMojoBlobURLsForTest mojo_blob_urls_ = true; + base::test::ScopedFeatureList scoped_feature_list_; Persistent<NullExecutionContext> execution_context_; FakeBlobURLStore url_store_; |