PPAPI: Make output protection API work with mus+ash

services/ui/display/screen_manager_ozone_internal.cc

 // Copyright 2016 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 "services/ui/display/screen_manager_ozone_internal.h"
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/system/devicemode.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/ui/display/output_protection.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/display/manager/chromeos/display_change_observer.h"
 #include "ui/display/manager/chromeos/touch_transform_controller.h"
 #include "ui/display/manager/display_layout_store.h"
 #include "ui/display/manager/display_manager_utilities.h"
 #include "ui/display/screen.h"
 #include "ui/display/screen_base.h"
 #include "ui/display/types/display_snapshot.h"
 #include "ui/display/types/fake_display_controller.h"
 #include "ui/display/types/native_display_delegate.h"
@@ skipping 103 matching lines @@
   display_manager_->set_force_bounds_changed(false);
 
   DVLOG(1) << "Primary display changed from " << old_primary_display_id
            << " to " << primary_display_id_;
   delegate_->OnPrimaryDisplayChanged(primary_display_id_);
 }
 
 void ScreenManagerOzoneInternal::AddInterfaces(
     service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::DisplayController>(this);
+  registry->AddInterface<mojom::OutputProtection>(this);
   registry->AddInterface<mojom::TestDisplayController>(this);
 }
 
 void ScreenManagerOzoneInternal::Init(ScreenManagerDelegate* delegate) {
   DCHECK(delegate);
   delegate_ = delegate;
 
   // Tests may inject a NativeDisplayDelegate, otherwise get it from
   // OzonePlatform.
   if (!native_display_delegate_) {
@@ skipping 236 matching lines @@
 }
 
 void ScreenManagerOzoneInternal::Create(
     const service_manager::Identity& remote_identity,
     mojom::DisplayControllerRequest request) {
   controller_bindings_.AddBinding(this, std::move(request));
 }
 
 void ScreenManagerOzoneInternal::Create(
     const service_manager::Identity& remote_identity,
+    mojom::OutputProtectionRequest request) {
+  mojo::MakeStrongBinding(
+      base::MakeUnique<OutputProtection>(display_configurator()),
+      std::move(request));
+}
+
+void ScreenManagerOzoneInternal::Create(
+    const service_manager::Identity& remote_identity,
     mojom::TestDisplayControllerRequest request) {
   test_bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace display