Revert of 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"
@@ skipping 91 matching lines @@
   // TODO(jam): pass referrer and other HTTP data to NavigatorHost so we can
   // use a new process in this case.
   if (!request.httpHeaderField(blink::WebString::fromUTF8("Referer")).isEmpty())
     return true;
 
   // Otherwise we don't know if we're the right app to handle this request. Ask
   // host to do the navigation for us.
   return false;
 }
 
-bool AreSecureCodecsSupported() {
-  // Hardware-secure codecs are not currently supported by HTML Viewer on any
-  // platform.
-  return false;
-}
-
 }  // namespace
 
 HTMLDocument::HTMLDocument(
     mojo::InterfaceRequest<mojo::ServiceProvider> services,
     URLResponsePtr response,
     mojo::Shell* shell,
     scoped_refptr<base::MessageLoopProxy> compositor_thread,
     WebMediaPlayerFactory* web_media_player_factory,
     bool is_headless)
     : response_(response.Pass()),
@@ skipping 199 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(
-        base::Bind(&AreSecureCodecsSupported), GetCdmFactory(),
-        GetMediaPermission()));
+        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 @@
   return media_permission_.get();
 }
 
 media::CdmFactory* HTMLDocument::GetCdmFactory() {
   if (!cdm_factory_)
     cdm_factory_.reset(new media::DefaultCdmFactory());
   return cdm_factory_.get();
 }
 
 }  // namespace html_viewer