Restrict use of hardware-secure codecs based on the RendererPreference.

components/html_viewer/html_document.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/html_viewer/html_document.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
+#include "build/build_config.h"
 #include "components/html_viewer/blink_input_events_type_converters.h"
 #include "components/html_viewer/blink_url_request_type_converters.h"
 #include "components/html_viewer/web_layer_tree_view_impl.h"
 #include "components/html_viewer/web_media_player_factory.h"
 #include "components/html_viewer/web_storage_namespace_impl.h"
 #include "components/html_viewer/web_url_loader_impl.h"
 #include "components/surfaces/public/interfaces/surfaces.mojom.h"
 #include "components/view_manager/public/cpp/view.h"
 #include "media/blink/webencryptedmediaclient_impl.h"
 #include "media/cdm/default_cdm_factory.h"
@@ skipping 296 matching lines @@
     blink::WebLocalFrame* frame,
     const blink::WebHistoryItem& history_item,
     blink::WebHistoryCommitType commit_type) {
   if (navigator_host_.get())
     navigator_host_->DidNavigateLocally(history_item.urlString().utf8());
 }
 
 blink::WebEncryptedMediaClient* HTMLDocument::encryptedMediaClient() {
   if (!web_encrypted_media_client_) {
     web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl(
+#if defined(OS_ANDROID)
+        base::Bind(&AllowSecureSurfaces),
+#endif  // defined(OS_ANDROID)
         GetCdmFactory(), GetMediaPermission()));
   }
   return web_encrypted_media_client_.get();
 }
 
 void HTMLDocument::OnViewBoundsChanged(View* view,
                                        const Rect& old_bounds,
                                        const Rect& new_bounds) {
   DCHECK_EQ(view, root_);
   UpdateWebviewSizeFromViewSize();
@@ skipping 34 matching lines @@
     media_permission_.reset(new media::DefaultMediaPermission(true));
   return media_permission_.get();
 }
 
 media::CdmFactory* HTMLDocument::GetCdmFactory() {
   if (!cdm_factory_)
     cdm_factory_.reset(new media::DefaultCdmFactory());
   return cdm_factory_.get();
 }
 
+#if defined(OS_ANDROID)
+bool AllowSecureSurfaces() {

[ddorwin, 2015/05/06 02:17:11]

This could be interrupted as doing something. Use Is...
IsSecureSurfaceAllowed?

[sandersd (OOO until July 31), 2015/05/08 00:37:42]

Done.

+  return false;

[ddorwin, 2015/05/06 02:17:11]

Add some sort of comment. i.e. not currently supported by HTML Viewer.

[sandersd (OOO until July 31), 2015/05/08 00:37:42]

Done.

+}
+#endif  // defined(OS_ANDROID)
+
 }  // namespace html_viewer