PPAPI: Make output protection API work with mus+ash

ui/display/manager/chromeos/display_configurator.h

Index: ui/display/manager/chromeos/display_configurator.h
diff --git a/ui/display/manager/chromeos/display_configurator.h b/ui/display/manager/chromeos/display_configurator.h
index c9034adf3609d7771818fea79a7d42eaebf79694..220d1dacbb527b5fceab7b165c59a855de79ea50 100644
--- a/ui/display/manager/chromeos/display_configurator.h
+++ b/ui/display/manager/chromeos/display_configurator.h
@@ -45,26 +45,21 @@ 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;