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

Side by Side Diff: content/shell/renderer/shell_content_renderer_client.cc

Issue 2268283003: media: Add External Clear Key content browser test on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix compile error Created 4 years, 3 months 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/shell/renderer/shell_content_renderer_client.h" 5 #include "content/shell/renderer/shell_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "components/cdm/renderer/external_clear_key_key_system_properties.h"
13 #include "components/web_cache/renderer/web_cache_impl.h" 14 #include "components/web_cache/renderer/web_cache_impl.h"
14 #include "content/public/test/test_mojo_service.mojom.h" 15 #include "content/public/test/test_mojo_service.mojom.h"
15 #include "content/shell/common/shell_switches.h" 16 #include "content/shell/common/shell_switches.h"
16 #include "content/shell/renderer/shell_render_view_observer.h" 17 #include "content/shell/renderer/shell_render_view_observer.h"
17 #include "mojo/public/cpp/bindings/binding.h" 18 #include "mojo/public/cpp/bindings/binding.h"
18 #include "mojo/public/cpp/system/message_pipe.h" 19 #include "mojo/public/cpp/system/message_pipe.h"
19 #include "services/shell/public/cpp/interface_registry.h" 20 #include "services/shell/public/cpp/interface_registry.h"
20 #include "third_party/WebKit/public/web/WebTestingSupport.h" 21 #include "third_party/WebKit/public/web/WebTestingSupport.h"
21 #include "third_party/WebKit/public/web/WebView.h" 22 #include "third_party/WebKit/public/web/WebView.h"
22 #include "v8/include/v8.h" 23 #include "v8/include/v8.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 blink::WebTestingSupport::injectInternalsObject(context); 123 blink::WebTestingSupport::injectInternalsObject(context);
123 } 124 }
124 } 125 }
125 126
126 void ShellContentRendererClient::ExposeInterfacesToBrowser( 127 void ShellContentRendererClient::ExposeInterfacesToBrowser(
127 shell::InterfaceRegistry* interface_registry) { 128 shell::InterfaceRegistry* interface_registry) {
128 interface_registry->AddInterface<mojom::TestMojoService>( 129 interface_registry->AddInterface<mojom::TestMojoService>(
129 base::Bind(&CreateTestMojoService)); 130 base::Bind(&CreateTestMojoService));
130 } 131 }
131 132
133 #if defined(OS_ANDROID)
134 void ShellContentRendererClient::AddSupportedKeySystems(
135 std::vector<std::unique_ptr<media::KeySystemProperties>>* key_systems) {
136 static const char kExternalClearKeyKeySystem[] =
137 "org.chromium.externalclearkey";
138 key_systems->emplace_back(
139 new cdm::ExternalClearKeyProperties(kExternalClearKeyKeySystem));
140 }
141 #endif
142
132 } // namespace content 143 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698