diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-01-31 16:33:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-02-06 16:33:22 +0000 |
| commit | da51f56cc21233c2d30f0fe0d171727c3102b2e0 (patch) | |
| tree | 4e579ab70ce4b19bee7984237f3ce05a96d59d83 /chromium/components/cdm | |
| parent | c8c2d1901aec01e934adf561a9fdf0cc776cdef8 (diff) | |
| download | qtwebengine-chromium-da51f56cc21233c2d30f0fe0d171727c3102b2e0.tar.gz | |
BASELINE: Update Chromium to 65.0.3525.40
Also imports missing submodules
Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/components/cdm')
| -rw-r--r-- | chromium/components/cdm/browser/DEPS | 1 | ||||
| -rw-r--r-- | chromium/components/cdm/browser/media_drm_storage_impl_unittest.cc | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/chromium/components/cdm/browser/DEPS b/chromium/components/cdm/browser/DEPS index 836cdf44309..3a2cd64a9ec 100644 --- a/chromium/components/cdm/browser/DEPS +++ b/chromium/components/cdm/browser/DEPS @@ -8,5 +8,4 @@ include_rules = [ # For testing "+content/public/test", - "+content/test", ] diff --git a/chromium/components/cdm/browser/media_drm_storage_impl_unittest.cc b/chromium/components/cdm/browser/media_drm_storage_impl_unittest.cc index d44fb882614..30e93d5e6b8 100644 --- a/chromium/components/cdm/browser/media_drm_storage_impl_unittest.cc +++ b/chromium/components/cdm/browser/media_drm_storage_impl_unittest.cc @@ -10,7 +10,7 @@ #include "base/unguessable_token.h" #include "components/prefs/testing_pref_service.h" #include "content/public/test/navigation_simulator.h" -#include "content/test/test_render_frame_host.h" +#include "content/public/test/test_renderer_host.h" #include "media/mojo/services/mojo_media_drm_storage.h" #include "mojo/public/cpp/bindings/interface_request.h" #include "mojo/public/cpp/bindings/strong_binding.h" |