Support unprefixed EME in HTMLViewer.

mojo/services/html_viewer/html_document.h

 // 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.
 
 #ifndef MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_
 #define MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 10 matching lines @@
 #include "mojo/services/view_manager/public/cpp/view_manager_client_factory.h"
 #include "mojo/services/view_manager/public/cpp/view_manager_delegate.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
 #include "third_party/WebKit/public/web/WebFrameClient.h"
 #include "third_party/WebKit/public/web/WebViewClient.h"
 
 namespace base {
 class MessageLoopProxy;
 }
 
+namespace media {
+class WebEncryptedMediaClientImpl;
+}
+
 namespace mojo {
 class ViewManager;
 class View;
 }
 
 namespace html_viewer {
 
 class AxProviderImpl;
 class WebLayerTreeViewImpl;
 class WebMediaPlayerFactory;
@@ skipping 49 matching lines @@
       blink::WebNavigationType nav_type,
       blink::WebNavigationPolicy default_policy,
       bool isRedirect);
   virtual void didAddMessageToConsole(const blink::WebConsoleMessage& message,
                                       const blink::WebString& source_name,
                                       unsigned source_line,
                                       const blink::WebString& stack_trace);
   virtual void didNavigateWithinPage(blink::WebLocalFrame* frame,
                                      const blink::WebHistoryItem& history_item,
                                      blink::WebHistoryCommitType commit_type);
+  virtual blink::WebEncryptedMediaClient* encryptedMediaClient();
 
   // ViewManagerDelegate methods:
   void OnEmbed(
       mojo::ViewManager* view_manager,
       mojo::View* root,
       mojo::ServiceProviderImpl* embedee_service_provider_impl,
       scoped_ptr<mojo::ServiceProvider> embedder_service_provider) override;
   void OnViewManagerDisconnected(mojo::ViewManager* view_manager) override;
 
   // ViewObserver methods:
@@ skipping 14 matching lines @@
   scoped_ptr<mojo::ServiceProvider> embedder_service_provider_;
   mojo::Shell* shell_;
   mojo::LazyInterfacePtr<mojo::NavigatorHost> navigator_host_;
   blink::WebView* web_view_;
   mojo::View* root_;
   mojo::ViewManagerClientFactory view_manager_client_factory_;
   scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_;
   scoped_refptr<base::MessageLoopProxy> compositor_thread_;
   WebMediaPlayerFactory* web_media_player_factory_;
 
+  // EncryptedMediaClient attached to this frame; lazily initialized.
+  media::WebEncryptedMediaClientImpl* web_encrypted_media_client_;
+
   // HTMLDocument owns these pointers.
   std::set<AxProviderImpl*> ax_provider_impls_;
 
   DISALLOW_COPY_AND_ASSIGN(HTMLDocument);
 };
 
 }  // namespace html_viewer
 
 #endif  // MOJO_SERVICES_HTML_VIEWER_HTML_DOCUMENT_H_