PPAPI: Make output protection API work with mus+ash

ui/display/manager/chromeos/display_configurator.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 UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 #define UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 27 matching lines @@
 class DisplayMode;
 class DisplaySnapshot;
 class NativeDisplayDelegate;
 class UpdateDisplayConfigurationTask;
 
 // This class interacts directly with the system display configurator.
 class DISPLAY_MANAGER_EXPORT DisplayConfigurator
     : public NativeDisplayObserver {
  public:
   typedef uint64_t ContentProtectionClientId;
-  static const ContentProtectionClientId kInvalidClientId = 0;
+  enum : ContentProtectionClientId {
+    kInvalidClientId = 0,

[sky, 2017/02/10 19:24:56]

enums use ALL_CAPS style.

[Peng, 2017/02/10 20:35:47]

Done.

+  };
 
   typedef base::Callback<void(bool /* success */)> ConfigurationCallback;
 
   typedef base::Callback<void(bool /* success */)> EnableProtectionCallback;
 
-  struct QueryProtectionResponse {
-    // True if the query succeeded, false otherwise.
-    bool success = false;
-
-    // The type of connected display links, which is a bitmask of
-    // DisplayConnectionType values.
-    uint32_t link_mask = 0;
-
-    // The desired protection methods, which is a bitmask of the
-    // ContentProtectionMethod values.
-    uint32_t protection_mask = 0;
-  };
-
-  typedef base::Callback<void(const QueryProtectionResponse&)>
+  // link_mask: The type of connected display links, which is a bitmask of
+  // DisplayConnectionType values.
+  // protection_mask: The desired protection methods, which is a bitmask of the
+  // ContentProtectionMethod values.
+  typedef base::Callback<void(bool /* success */,

[sky, 2017/02/10 19:24:56]

Use using?

[Peng, 2017/02/10 20:35:47]

Done.

+                              uint32_t /* link_mask */,
+                              uint32_t /* protection_mask */)>
       QueryProtectionCallback;
 
   typedef base::Callback<void(bool /* success */)> DisplayControlCallback;
 
   typedef std::vector<DisplaySnapshot*> DisplayStateList;
 
   // Mapping a display_id to a protection request bitmask.
   typedef std::map<int64_t, uint32_t> ContentProtections;
 
   class Observer {
@@ skipping 406 matching lines @@
 
   // This must be the last variable.
   base::WeakPtrFactory<DisplayConfigurator> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayConfigurator);
 };
 
 }  // namespace display
 
 #endif  // UI_DISPLAY_MANAGER_CHROMEOS_DISPLAY_CONFIGURATOR_H_